Changeset 720

Timestamp:

Sep 24, 2003, 8:29:22 PM (22 years ago)

Author:

bird

Message:

#456: Attempts on DBGPACK support - linker doesn't like our debug info thus not working yet.
#456: Hack for making debug info for global external variables. ($hll$)

File:

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

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

@@ -184 +184 @@
  * Link386              support HLL v3 (?)
  */
-int hll_version = 4;
+int hll_version = 6;
 
 /* Private variables. */
@@ -1086 +1086 @@
    À
 
-   Symbol indices are assigned sequentially. */
+   Symbol indices are assigned sequentially.
+
+   Note. $hll$ is a hack for making debug info for global externals,
+   we need the extdef for the 2nd entry of the fake alias. */
 
 static void write_extdef (void)
@@ -1096 +1099 @@
   for (i = 0; i < sym_count; ++i)
     if (sym_ptr[i].n_type == (N_INDR|N_EXT))
-      ++i;                      /* Skip immediately following entry */
+      {
+        if (!strstr(str_ptr + sym_ptr[i].n_un.n_strx, "$hll$"))
+          ++i;                    /* Skip immediately following entry */
+      }
     else if (sym_ptr[i].n_type == N_EXT && sym_ptr[i].n_value == 0)
       {
@@ -1272 +1278 @@
 
 
-/* Write ALIAS records into the output file for all indirect
-   references. */
+/* Write ALIAS records into the output file for all indirect references.
+   Note. The $hll$ aliases are debug info hacks and must be skipped! */
 
 static void write_alias (void)
@@ -1281 +1287 @@
 
   for (i = 0; i < sym_count - 1; ++i)
-    if (sym_ptr[i].n_type == (N_INDR|N_EXT) && sym_ptr[i+1].n_type == N_EXT)
+    if (sym_ptr[i].n_type == (N_INDR|N_EXT) && sym_ptr[i+1].n_type == N_EXT
+     && !strstr(str_ptr + sym_ptr[i].n_un.n_strx, "$hll$"))
       {
         init_rec (ALIAS);
@@ -1393 +1400 @@
     int i;
 
-    if (opt_rmunder || strip_symbols)
+    if (opt_rmunder || strip_symbols || !a_out_h->a_syms)
         return;
 
@@ -2035 +2042 @@
 static void write_debug_style (void)
 {
+  if (strip_symbols || !a_out_h->a_syms)
+    return;
   init_rec (COMENT);
   put_8 (0x80);
@@ -2838 +2847 @@
 
 
+/* Tell ilink which TIS (Tools I Standard) version we follow.
+   (At least that's what I think this comment record is good for). */
+static void write_tis ()
+{
+  unsigned short ver = 0;
+  char *type = getenv ("EMXOMFLD_TYPE");
+  if (type && !stricmp (type, "VAC308"))
+      ver = 0x0100;
+  else if (!type || !stricmp (type, "VAC365"))
+      ver = 0x0101;
+  /* else: no TIS record for link386! */
+
+  if (ver)
+    {
+      init_rec (COMENT);
+      put_8 (0x00);
+      put_8 (CLASS_TIS);
+      put_mem ("TIS", 3);
+      put_16 (ver);
+      write_rec ();
+    }
+}
+
+
 /* Tell ilink which dll to use when /DBGPACK is specificed. The dllname
    is given without extension. */
 static void write_dbgpack ()
 {
-    const char *name = dbgpack_name;
-    if (!name)
-      {
-        char *type = getenv ("EMXOMFLD_TYPE");
-        if (type && !stricmp (type, "VAC308"))
-            name = "LNKOH410";
-        else if (!type || !stricmp (type, "VAC365"))
-            name = "CPPLH436";
-        /* no DLL for link386! */
-      }
-
-    if (name)
-      {
-        init_rec (COMENT);
-        put_8 (0x80);
-        put_8 (CLASS_DBGPACK);
-        put_str (name);
-        write_rec ();
-      }
+  const char *name = dbgpack_name;
+  if (strip_symbols || !a_out_h->a_syms)
+    return;
+  if (!name)
+    {
+      char *type = getenv ("EMXOMFLD_TYPE");
+      if (type && !stricmp (type, "VAC308"))
+          name = "LNKOH410";
+      else if (!type || !stricmp (type, "VAC365"))
+          name = hll_version == 4 ?  "CPPLH436" : "CPPLH636";
+      /* no DLL for link386! */
+    }
+
+  if (name)
+    {
+      init_rec (COMENT);
+      put_8 (0x80);
+      put_8 (CLASS_DBGPACK);
+      put_str (name);
+      write_rec ();
+    }
 }
 
@@ -3353 +3388 @@
   else
     udat_seg_name = data_seg_name;
-  if (!strip_symbols)
+  if (!strip_symbols && a_out_h->a_syms)
     {
       symbols_seg_name = find_lname ("$$SYMBOLS");
@@ -3361 +3396 @@
   data_class_name = find_lname ("DATA");
   bss_class_name = find_lname ("BSS");
-  if (!strip_symbols)
+  if (!strip_symbols && a_out_h->a_syms)
     {
       debsym_class_name = find_lname ("DEBSYM");
@@ -3382 +3417 @@
   write_theadr ();
 
-  /* Tell LINK386 what identifier manipulator DLL to use. */
-
-  write_idmdll ();
-
-  /* Tell ilink what DBGPACK DLL to use. */
-
-  write_dbgpack ();
+  /* Tell ilink what TIS standard we follow. */
+
+  write_tis ();
 
   /* Write default library requests and the debug information style
@@ -3395 +3426 @@
   write_libs ();
   write_debug_style ();
+
+  /* Tell ilink what DBGPACK DLL to use. */
+
+  write_dbgpack ();
+
+  /* Tell LINK386 what identifier manipulator DLL to use. */
+
+  write_idmdll ();
 
   /* Define all the OMF names (LNAMES record).  Of course, we must not
@@ -3423 +3462 @@
     stack_index = seg_def (stack_seg_name, stack_class_name, 0x8000, TRUE, FALSE);
 
-  if (!strip_symbols)
+  if (!strip_symbols && a_out_h->a_syms)
     {
       convert_debug ();         /* After seg_def of text, data & bss */
@@ -3478 +3517 @@
   write_set_data ();
 
-  if (!strip_symbols)
+  if (!strip_symbols && a_out_h->a_syms)
     {
       write_seg (types_index, types_seg_name, tt.buf, tt.size, NULL, 0, FALSE,
@@ -3957 +3996 @@
 
   tmp = getenv("EMXOMFLD_TYPE");
-  if (tmp && !stricmp(tmp, "LINK386"))
-      hll_version = 3;
+  if (tmp)
+    {
+      if (!stricmp (tmp, "VAC308"))
+        hll_version = 4;
+      else if (!stricmp (tmp, "LINK386"))
+        hll_version = 3;
+    }
 
   /* Parse the command line options. */