Changeset 806

Timestamp:

Oct 6, 2003, 2:05:18 AM (22 years ago)

Author:

bird

Message:

#456: Fixing major sst encoding problem, bad size field. Try get a type index on pubs and exts. Fixed a little problem with static members.

Location:

trunk/src/emx/src/emxomf

Files:

• emxomf.c (modified) (12 diffs, 1 prop)
• emxomf.h (modified) (1 diff, 1 prop)
• stabshll.c (modified) (12 diffs, 1 prop)

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

@@ -57 +57 @@
   int index;                    /* EXTDEF index */
   int flags;                    /* SF_FAR16 */
+  int hll_type;                 /* HLL type index. */
 };
 
@@ -608 +609 @@
 
 
+/* Set the hll_type of a symbols. */
+void set_hll_type (int index, int hll_type)
+{
+  if (index > sym_count || index < 0)
+    error ("Internal error! Invalid index (%d) passed to set_hll_type().", index);
+fprintf(stderr, "dbg: set_hll_type %x %s %d\n", sym_ptr[index].n_type, str_ptr + sym_ptr[index].n_un.n_strx, hll_type);
+  sym_more[index].hll_type = hll_type;
+}
+
+
 /* Add a symbol to 0 symbol list */
 
@@ -909 +920 @@
 static void put_str (const char *src)
 {
+  char sz[256];
   int len;
 
   len = strlen (src);
   if (len > 255)
-    {
+    { /* Hash the symbol to help making it unique. */
+      const char *  psz = src;
+      unsigned      uhash = 0;
+      char          szhash[16];
       warning ("Symbol length truncated to 255 characters for `%s'", src);
+      for (; *psz; psz++)
+        uhash = ((uhash << 3) ^ (*psz & 0x15)); /** @todo fix this rather bad hash algorithm. */
+      len = sprintf(szhash, "!_%X", 0x7fffffff & uhash);
+      memcpy(sz, src, 255);
+      memcpy(sz + 255 - len, szhash, len + 1);
       len = 255;
+      src = &sz[0];
     }
   if (!fits (1+len))
@@ -1071 +1092 @@
    record.  PSTARTED points to an object keeping state. */
 
-static void add_extdef (int *pstarted, const char *name)
+static void add_extdef (int *pstarted, const char *name, int type)
 {
   if (*pstarted && !fits (strlen (name)+3))
@@ -1084 +1105 @@
     }
   put_sym (name);
-  put_idx (0);                  /* type index */
+  put_idx (type);                       /* type index */
 }
 
@@ -1115 +1136 @@
         if (memcmp (name, "_16_", 4) == 0)
           sym_more[i].flags |= SF_FAR16;
-        add_extdef (&started, name);
+        add_extdef (&started, name, sym_more[i].hll_type);
       }
     else if (sym_ptr[i].n_type == N_WEAKU)
@@ -1122 +1143 @@
           {
             weak_zero_index = sym_index++;
-            add_extdef (&started, "WEAK$ZERO");
+            add_extdef (&started, "WEAK$ZERO", 0);
           }
         sym_more[i].index = sym_index++;
-        add_extdef (&started, str_ptr + sym_ptr[i].n_un.n_strx);
+        add_extdef (&started, str_ptr + sym_ptr[i].n_un.n_strx, sym_more[i].hll_type);
       }
 #if 0 /* this isn't actually required if only the assembler could do what it's supposed to... */
@@ -1134 +1155 @@
         name = str_ptr + sym_ptr[i].n_un.n_strx;
         sym_more[i].index = sym_index++;
-        add_extdef (&started, name);
+        add_extdef (&started, name, sym_more[i].hll_type);
       }
 #endif
@@ -1390 +1411 @@
                 else
                   put_16 (address);
-                put_idx (0);        /* type index */
+                put_idx (sym_more[i].hll_type); /* type index */
               }
           }
@@ -1431 +1452 @@
               else
                 put_16 (address);
-              put_idx (0);        /* type index */
+              put_idx (sym_more[i].hll_type);   /* type index */
               write_rec ();
               break;
@@ -3299 +3320 @@
   byte *t;
   const struct nlist *entry_symbol;
-  int i;
 
   /* Simplify things by reading the complete a.out module into
@@ -3339 +3359 @@
 
   sym_more = xmalloc (sym_count * sizeof (struct symbol));
-  for (i = 0; i < sym_count; ++i)
-    {
-      sym_more[i].index = 0;
-      sym_more[i].flags = 0;
-    }
+  memset(sym_more, 0, sym_count * sizeof (struct symbol));
 
   /* Print unknown symbol table entries if the -u option is given. */

trunk/src/emx/src/emxomf/emxomf.h

@@ -32 +32 @@
 extern const struct nlist *find_symbol (const char *name);
 extern const struct nlist *find_symbol_ex (const char *name, int not_entry, int fext);
+extern void set_hll_type (int index, int hll_type);
 
 /* These variables are defined in emxomf.c. */

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

@@ -555 +555 @@
   grow_by (&sst_boundary_grow, 1);
   sst_boundary[sst_boundary_grow.count++] = sst.size;
-  buffer_byte (&sst, 0);        /* Length of sub-record */
-  buffer_byte (&sst, type);     /* Type of sub-record */
+  /* Length of sub-record - bird: not sure if HL03 likes this. */
+  buffer_byte (&sst, 0x80);
+  buffer_byte (&sst, 0);
+  /* Type of sub-record */
+  buffer_byte (&sst, type);
 }
 
@@ -565 +568 @@
 static void sst_end (void)
 {
-  if (sst.size - subrec_start - 1 > 255)
+  int len = sst.size - subrec_start - 2;
+  if (len > 1000)
     error ("sst_end: Record too big");
-  sst.buf[subrec_start] = sst.size - subrec_start - 1;
+  sst.buf[subrec_start] = (len >> 8) | 0x80;
+  sst.buf[subrec_start + 1] = 0xff & len;
 }
 
@@ -579 +584 @@
 
 static void sst_static (const char *name, dword addr, int type_index,
-                        int sym_seg, int ext)
+                        int sym_seg, int ext, const struct nlist *psym)
 {
   struct relocation_info r;
-
-  sst_start (SST_static);
+  size_t len = strlen (name);
+
+  if (!psym)
+    {
+      psym = find_symbol_ex (name, -1, ext);
+      if (!psym)
+        {
+          char *psz = alloca (len + 2);
+          *psz = '_';
+          memcpy(psz + 1, name, len + 1);
+          psym = find_symbol_ex (psz, -1, ext);
+        }
+    }
+  if (psym)
+    set_hll_type (psym - sym_ptr, type_index);
+
+  if (len > 255)
+    sst_start (SST_CPPstatic);
+  else
+    sst_start (SST_static);
   r.r_address = sst.size;
   buffer_dword (&sst, addr);      /* Segment offset */
   buffer_word (&sst, 0);          /* Segment address */
   buffer_word (&sst, type_index); /* Type index */
-  buffer_nstr (&sst, name);       /* Symbol name */
+  if (len > 255)
+    buffer_enc (&sst, name);      /* Symbol name - encoded. */
+  else
+    buffer_nstr (&sst, name);     /* Symbol name */
   sst_end ();
   r.r_extern = ext;
@@ -2268 +2294 @@
                       t1 = type_add (&t);
                     }
+                  tf->offset = offset >> 3;
                 }
               tf->type = t1;
-              tf->offset = offset >> 3;
             }
         }
@@ -3228 +3254 @@
   n = p - str;
 
-  /*
-   * The debuggers doesn't like looong names. Besides it doesn't know how to
-   * demangle them either. This is the place to deal with this.
-   * (The limit seems to be 106 bytes.)
-   *
-   * For now we'll just make sure the name ain't too long.
-   */
-  if (n > 106)
-    {
-      char szName[106];
-      memcpy(szName, str, sizeof(szName) - 1);
-      szName[sizeof(szName) - 1] = '!'; /* mark it as cut. */
-      name = strpool_addn(str_pool, str, sizeof(szName));
-    }
-  else
-    name = strpool_addn(str_pool, str, n);
-
+  /** @todo name demangling */
+  name = strpool_addn (str_pool, str, n);
   proc_start_addr = symbol->n_value;
 
@@ -3328 +3339 @@
       make_type (t2, &ti);
 
-      sst_start (cplusplus_flag ? SST_CPPproc : SST_proc);
+      sst_start (cplusplus_flag || n > 255 ? SST_CPPproc : SST_proc);
       r.r_address = sst.size;
       buffer_dword (&sst, symbol->n_value); /* Segment offset */
@@ -3338 +3349 @@
       buffer_word (&sst, 0);        /* Class type (for member functions) */
       buffer_byte (&sst, 8);        /* 32-bit near */
-      if (cplusplus_flag)
+      if (cplusplus_flag || n > 255)
         buffer_enc (&sst, name);    /* Proc name */
       else
@@ -3350 +3361 @@
   r.r_pad = 0;
   buffer_mem (&sst_reloc, &r, sizeof (r));
+  set_hll_type (symbol - sym_ptr, ti);
 }
 
@@ -3435 +3447 @@
                     {
                       if (sym2->n_type == N_EXT)
-                        sst_static (name, 0, ti, sym2 - sym_ptr, 1);
+                        sst_static (name, 0, ti, sym2 - sym_ptr, 1, sym2);
                       else
-                        sst_static (name, sym2->n_value, ti, sym2->n_type, 0);
+                        sst_static (name, sym2->n_value, ti, sym2->n_type, 0, sym2);
                       break;
                     }
@@ -3467 +3479 @@
             }
           if (sym2->n_type == N_EXT)
-            sst_static (name, 0, ti, sym2 - sym_ptr, 1);
+            sst_static (name, 0, ti, sym2 - sym_ptr, 1, sym2);
           else
-            sst_static (name, sym2->n_value, ti, sym2->n_type, 0);
+            sst_static (name, sym2->n_value, ti, sym2->n_type, 0, sym2);
           break;
           }
@@ -3490 +3502 @@
           printf ("  type=%#x\n", ti);
 #endif
-          sst_static (name, symbol->n_value, ti, where, 0);
+          sst_static (name, symbol->n_value, ti, where, 0, NULL);
           break;
 
@@ -3800 +3812 @@
 
   /* Check whether converting a translated C++ program. */
-  #if 1 /* kso #465 2003-06-04: pretend everything is C++, that symbols is no longer present. */
+#if 1 /* kso #465 2003-06-04: pretend everything is C++, that symbols is no longer present. */
   cplusplus_flag = 1;
-  #else
+#else
   cplusplus_flag = (find_symbol ("__gnu_compiled_cplusplus") != NULL);
-  #endif
+#endif