Changeset 721

Timestamp:

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

Author:

bird

Message:

#456: Special hack for global variable - defined and undefines.

File:

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

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

@@ -597 +597 @@
       case ty_memfunc:      uhash = (unsigned)t->d.memfunc.type; break;
       case ty_baseclass:    uhash = (unsigned)t->d.baseclass.type; break;
+      default:break; /* shut up warnings. */
     }
   uhash += t->tag;
@@ -3219 +3220 @@
   char *name;
   const char *str, *p;
-  const struct nlist *symbol, *sym2;
+  const struct nlist *symbol;
   struct type *t1;
   int i, n, ti, alloc_flag;
@@ -3239 +3240 @@
         {
         case 'G':
+          /* Static storage, global scope */
+          #if 1 /* birds ugly hacking of 'G' allow this code path. */
+          if (where == -1)
+            {
+              /* I really hope this works! */
+              where = symbol->n_type == N_FUN ? N_TEXT : N_DATA;
+            }
+          if (symbol->n_value == -12357)
+            { /* Special hack for unresolved external variables.
+                 We expect the previous two symbols to be an alias for the
+                 undefined symbol. The first of them will then have the name
+                 of this record with an $hll$ suffix. */
+              if (   *index >= 2
+                  && symbol[-2].n_type == (N_INDR | N_EXT)
+                  && symbol[-1].n_type == N_EXT
+                  && strstr(str_ptr + symbol[-2].n_un.n_strx, "$hll$"))
+                {
+                  ++parse_ptr;
+                  ti = hll_type ();
+#if defined (HLL_DEBUG)
+                  printf ("  type=%#x\n", ti);
+#endif
+                  sst_static (name, 0, ti, *index - 1, 1);
+                }
+              else
+                {
+                  warning ("Cannot find address of external variable %s", name);
+                  return;
+                }
+              break;
+            }
+          /* fall thru */
+
+          #else
           {
           char *psz;
           int   cch;
-          /* Static storage, global scope */
+          const struct nlist *sym2;
 
           ++parse_ptr;
@@ -3249 +3284 @@
           printf ("  type=%#x\n", ti);
 #endif
-
           psz = alloca(cch = strlen(name) + 2);
           *psz = '_';
@@ -3265 +3299 @@
           break;
           }
+          #endif
 
         case 'S':