Changeset 309

Timestamp:

Jun 10, 2003, 7:42:21 PM (22 years ago)

Author:

bird

Message:

#456: duplicate public text symbol _main as main so the debugger can find where to start debugging.

File:

• trunk/src/emx/src/emxomf/emxomf.c (modified) (2 diffs, 1 prop)

trunk/src/emx/src/emxomf/emxomf.c

@@ -1283 +1283 @@
 }
 
+/* Write main alias if _main is a pubdef.
+   The debugger looks for 'main' not '_main' in the symbol table. */
+static void write_pubdef_main ()
+{
+    int i;
+
+    if (opt_rmunder || strip_symbols)
+        return;
+
+    for (i = 0; i < sym_count; ++i)
+      if ((sym_ptr[i].n_type & ~N_EXT) == N_TEXT)
+        {
+          const char * name    = str_ptr + sym_ptr[i].n_un.n_strx;
+          dword        address = sym_ptr[i].n_value;
+          if (   (sym_ptr[i].n_type & N_EXT)
+              && !strcmp(name, "_main"))
+            {
+              int big = ((address >= 0x10000 || force_big) == big);
+
+              name++; /* skip the underscore */
+              if (out_lib != NULL)
+                {
+                  if (omflib_add_pub (out_lib, name, mod_page, lib_errmsg) != 0)
+                    error (lib_errmsg);
+                }
+              init_rec (big ? PUBDEF|REC32 : PUBDEF);
+              put_idx (flat_index);
+              put_idx (text_index);
+              put_sym (name);
+              if (big)
+                put_32 (address);
+              else
+                put_16 (address);
+              put_idx (0);        /* type index */
+              write_rec ();
+              break;
+            }
+        }
+}
 
 /* Write PUBDEF records into the output file for all the public N_TEXT
@@ -1292 +1331 @@
   write_pubdef1 (N_TEXT, text_index, FALSE, 0);
   write_pubdef1 (N_TEXT, text_index, TRUE, 0);
+  /* kso #456 2003-06-10: The debugger looks for 'main' not '_main'. */
+  write_pubdef_main ();
   write_pubdef1 (N_DATA, udat_index, FALSE, text_size);
   write_pubdef1 (N_DATA, udat_index, TRUE, text_size);