Changeset 3919

Timestamp:

Oct 25, 2014, 1:33:46 PM (11 years ago)

Author:

bird

Message:

trunk,0.6: emxomf: Warn once about HLL type indexes we cannot encode in PUBDEF and EXTDEF records and set them to 0 in the sym_more table so we don't die in put_idx and can correctly calculate record lengths. Fixes #293.

Files:

• branches/libc-0.6/src/emx/src/emxomf/emxomf.c (modified) (1 diff)
• trunk/emx/src/emxomf/emxomf.c (modified) (1 diff)

branches/libc-0.6/src/emx/src/emxomf/emxomf.c

@@ -593 +593 @@
   if (index > sym_count || index < 0)
     error ("Internal error! Invalid index (%d) passed to set_hll_type().", index);
+
+  /* Ignore type indexes we cannot encode (see put_idx), though, issue a
+     warning the first time we see this in a file (our repeat detection
+     isn't prefect as heap can be reused, but it'll have to do). */
+  if (hll_type < 0 || hll_type > 0x7fff)
+    {
+      static const char *s_pszComplainedFor = NULL;
+      if (s_pszComplainedFor != error_fname)
+        {
+          s_pszComplainedFor = error_fname;
+          warning ("Input file '%s' has more HLL debug types than we can index in PUBDEF and EXTDEF records.", error_fname);
+        }
+      hll_type = 0;
+    }
+
   sym_more[index].hll_type = hll_type;
 }

trunk/emx/src/emxomf/emxomf.c

@@ -593 +593 @@
   if (index > sym_count || index < 0)
     error ("Internal error! Invalid index (%d) passed to set_hll_type().", index);
+
+  /* Ignore type indexes we cannot encode (see put_idx), though, issue a
+     warning the first time we see this in a file (our repeat detection
+     isn't prefect as heap can be reused, but it'll have to do). */
+  if (hll_type < 0 || hll_type > 0x7fff)
+    {
+      static const char *s_pszComplainedFor = NULL;
+      if (s_pszComplainedFor != error_fname)
+        {
+          s_pszComplainedFor = error_fname;
+          warning ("Input file '%s' has more HLL debug types than we can index in PUBDEF and EXTDEF records.", error_fname);
+        }
+      hll_type = 0;
+    }
+
   sym_more[index].hll_type = hll_type;
 }