Changeset 236 for trunk/src/emx/src/emxomf/stabshll.c

Timestamp:

May 26, 2003, 4:43:12 PM (22 years ago)

Author:

zap

Message:

See ChangeLog.

File:

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

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

@@ -515 +515 @@
                         int sym_seg, int ext)
 {
-  struct reloc r;
+  struct relocation_info r;
 
   sst_start (SST_static);
-  r.address = sst.size;
+  r.r_address = sst.size;
   buffer_dword (&sst, addr);      /* Segment offset */
   buffer_word (&sst, 0);          /* Segment address */
@@ -524 +524 @@
   buffer_nstr (&sst, name);       /* Symbol name */
   sst_end ();
-  r.ext = ext;
-  r.length = 2;
-  r.symbolnum = sym_seg;
-  r.pcrel = 0;
-  r.unused = 0;
+  r.r_extern = ext;
+  r.r_length = 2;
+  r.r_symbolnum = sym_seg;
+  r.r_pcrel = 0;
+  r.r_pad = 0;
   buffer_mem (&sst_reloc, &r, sizeof (r));
-  r.address += 4;
-  r.length = 1;
+  r.r_address += 4;
+  r.r_length = 1;
   buffer_mem (&sst_reloc, &r, sizeof (r));
 }
@@ -772 +772 @@
 
 
-#if defined (DEBUG)
+#if defined (HLL_DEBUG)
 
 /* This function is used to print an internal type for debugging. */
@@ -819 +819 @@
       printf ("(");
       show_type (tp->d.array.etype);
-      printf ("[%d]", tp->d.array.last + 1 - tp->d.array.first);
+      printf ("[%ld]", tp->d.array.last + 1 - tp->d.array.first);
       break;
     case ty_bits:
@@ -2339 +2339 @@
   for (i = *index; i < sym_count; ++i)
     {
-      p = str_ptr + sym_ptr[i].string;
+      p = str_ptr + sym_ptr[i].n_un.n_strx;
       n = strlen (p);
       if (n > 0 && p[n-1] == '\\')
@@ -2351 +2351 @@
   if (i == *index)
     {
-      *str = str_ptr + sym_ptr[i].string;
+      *str = str_ptr + sym_ptr[i].n_un.n_strx;
       return FALSE;
     }
@@ -2360 +2360 @@
       for (i = *index; i < sym_count; ++i)
         {
-          p = str_ptr + sym_ptr[i].string;
+          p = str_ptr + sym_ptr[i].n_un.n_strx;
           n = strlen (p);
           if (n > 0 && p[n-1] == '\\')
@@ -2401 +2401 @@
       memcpy (name, str, n);
       name[n] = 0;
-#if defined (DEBUG)
+#if defined (HLL_DEBUG)
       printf ("LSYM/LCSYM/GSYM/PSYM/RSYM/STSYM/FUN %s\n", str);
 #endif
@@ -2421 +2421 @@
             ++parse_ptr;        /* synonymous type */
           t = parse_complete_type (name);
-#if defined (DEBUG)
+#if defined (HLL_DEBUG)
           printf ("  type: ");
           show_type (t);
@@ -2435 +2435 @@
           ++parse_ptr;
           t = parse_complete_type (name);
-#if defined (DEBUG)
+#if defined (HLL_DEBUG)
           printf ("  type: ");
           show_type (t);
@@ -2445 +2445 @@
         case '5': case '6': case '7': case '8': case '9':
           t = parse_complete_type (name);
-#if defined (DEBUG)
+#if defined (HLL_DEBUG)
           printf ("  type: ");
           show_type (t);
@@ -2464 +2464 @@
 {
   size_t ptr;
-  struct reloc r;
+  struct relocation_info r;
 
   sst_start (SST_begin);
-  r.address = sst.size;
+  r.r_address = sst.size;
   ptr = sst.size;
   buffer_dword (&sst, addr);    /* Segment offset */
@@ -2476 +2476 @@
   sst_end ();
 
-  r.ext = 0;
-  r.length = 2;
-  r.symbolnum = N_TEXT;
-  r.pcrel = 0;
-  r.unused = 0;
+  r.r_extern = 0;
+  r.r_length = 2;
+  r.r_symbolnum = N_TEXT;
+  r.r_pcrel = 0;
+  r.r_pad = 0;
   buffer_mem (&sst_reloc, &r, sizeof (r));
   return ptr;
@@ -2522 +2522 @@
   const char *p;
 
-  if (s->type != N_FUN)
+  if (s->n_type != N_FUN)
     return FALSE;
-  p = strchr (str_ptr + s->string, ':');
+  p = strchr (str_ptr + s->n_un.n_strx, ':');
   if (p == NULL)
     return FALSE;
@@ -2567 +2567 @@
       if (is_fun (&sym_ptr[i]))
         {
-          addr = sym_ptr[i].value;
+          addr = sym_ptr[i].n_value;
           break;
         }
@@ -2597 +2597 @@
       --block_grow.count;
       hll_end (block_stack[block_grow.count].patch_ptr, 0,
-               sym_ptr[i].value - block_stack[block_grow.count].addr);
+               sym_ptr[i].n_value - block_stack[block_grow.count].addr);
       if (block_grow.count == 0 && proc_patch_base != 0)
         fun_end (i);
@@ -2613 +2613 @@
 {
   struct type t, *t1, *t2;
-  struct reloc r;
+  struct relocation_info r;
   const char *str, *p;
   char *name;
   int n, ti;
 
-  str = str_ptr + symbol->string;
+  str = str_ptr + symbol->n_un.n_strx;
   p = strchr (str, ':');
   if (p == NULL)
@@ -2627 +2627 @@
   name[n] = 0;
 
-  proc_start_addr = symbol->value;
+  proc_start_addr = symbol->n_value;
 
   if (args_grow.count == 0)
@@ -2646 +2646 @@
   make_type (t2, &ti);
   sst_start (cplusplus_flag ? SST_CPPproc : SST_proc);
-  r.address = sst.size;
-  buffer_dword (&sst, symbol->value); /* Segment offset */
+  r.r_address = sst.size;
+  buffer_dword (&sst, symbol->n_value); /* Segment offset */
   buffer_word (&sst, ti);       /* Type index */
   proc_patch_base = sst.size;
@@ -2660 +2660 @@
     buffer_nstr (&sst, name);   /* Proc name */
   sst_end ();
-  r.ext = 0;
-  r.length = 2;
-  r.symbolnum = N_TEXT;
-  r.pcrel = 0;
-  r.unused = 0;
+  r.r_extern = 0;
+  r.r_length = 2;
+  r.r_symbolnum = N_TEXT;
+  r.r_pcrel = 0;
+  r.r_pad = 0;
   buffer_mem (&sst_reloc, &r, sizeof (r));
 }
@@ -2677 +2677 @@
   lbrac_index = -1;
   for (; i < sym_count; ++i)
-    if (sym_ptr[i].type == N_RBRAC || is_fun (&sym_ptr[i]))
+    if (sym_ptr[i].n_type == N_RBRAC || is_fun (&sym_ptr[i]))
       return;
-    else if (sym_ptr[i].type == N_LBRAC)
+    else if (sym_ptr[i].n_type == N_LBRAC)
       {
         lbrac_index = i;
-        block_begin (sym_ptr[i].value);
+        block_begin (sym_ptr[i].n_value);
         return;
       }
@@ -2715 +2715 @@
       memcpy (name, str, n);
       name[n] = 0;
-#if defined (DEBUG)
+#if defined (HLL_DEBUG)
       printf ("%s %s\n", msg, str);
 #endif
@@ -2727 +2727 @@
           ++parse_ptr;
           ti = hll_type ();
-#if defined (DEBUG)
+#if defined (HLL_DEBUG)
           printf ("  type=%#x\n", ti);
 #endif
@@ -2736 +2736 @@
               return;
             }
-          if (sym2->type == N_EXT)
+          if (sym2->n_type == N_EXT)
             sst_static (name, 0, ti, sym2 - sym_ptr, 1);
           else
-            sst_static (name, sym2->value, ti, sym2->type, 0);
+            sst_static (name, sym2->n_value, ti, sym2->n_type, 0);
           break;
 
@@ -2755 +2755 @@
           ++parse_ptr;
           ti = hll_type ();
-#if defined (DEBUG)
+#if defined (HLL_DEBUG)
           printf ("  type=%#x\n", ti);
 #endif
-          sst_static (name, symbol->value, ti, where, 0);
+          sst_static (name, symbol->n_value, ti, where, 0);
           break;
 
@@ -2774 +2774 @@
             {
               ti = hll_type ();
-#if defined (DEBUG)
+#if defined (HLL_DEBUG)
               printf ("  type=%#x\n", ti);
 #endif
               sst_start (SST_auto);
-              buffer_dword (&sst, symbol->value);  /* Offset into stk frame */
+              buffer_dword (&sst, symbol->n_value);/* Offset into stk frame */
               buffer_word (&sst, ti);              /* Type index */
               buffer_nstr (&sst, name);            /* Symbol name */
@@ -2802 +2802 @@
           ++parse_ptr;
           ti = hll_type ();
-          switch (symbol->value)
+          switch (symbol->n_value)
             {
             case 0:             /* EAX */
@@ -2853 +2853 @@
               break;
             default:
-              warning ("unknown register %lu", symbol->value);
+              warning ("unknown register %lu", symbol->n_value);
               return;
             }
@@ -2874 +2874 @@
             }
           ti = hll_type ();
-#if defined (DEBUG)
+#if defined (HLL_DEBUG)
           printf ("  type=%#x\n", ti);
 #endif
           sst_start (SST_auto);
-          buffer_dword (&sst, symbol->value);    /* Offset into stk frame */
+          buffer_dword (&sst, symbol->n_value);  /* Offset into stk frame */
           buffer_word (&sst, ti);                /* Type index */
           buffer_nstr (&sst, name);              /* Symbol name */
@@ -2906 +2906 @@
           last_fun_valid = TRUE;
           args_grow.count = 0;
-          last_fun_addr = symbol->value;
+          last_fun_addr = symbol->n_value;
           prologue_length = -1;
 
-          for (i = *index + 1; i < sym_count && sym_ptr[i].type == N_PSYM; ++i)
+          for (i = *index + 1; i < sym_count && sym_ptr[i].n_type == N_PSYM; ++i)
             parse_symbol (&i, -1, "PSYM", FALSE);
 
@@ -2920 +2920 @@
             {
               if (prologue_length == -1)
-                prologue_length = sym_ptr[lbrac_index].value - last_fun_addr;
+                prologue_length = sym_ptr[lbrac_index].n_value - last_fun_addr;
             }
 
           /* Parameters */
 
-          while (*index + 1 < sym_count && sym_ptr[*index+1].type == N_PSYM)
+          while (*index + 1 < sym_count && sym_ptr[*index+1].n_type == N_PSYM)
             {
               ++(*index);
@@ -2999 +2999 @@
 static void write_changseg (void)
 {
-  struct reloc r;
+  struct relocation_info r;
 
   sst_start (SST_changseg);
-  r.address = sst.size;
+  r.r_address = sst.size;
   buffer_word (&sst, 0);        /* Segment number */
   buffer_word (&sst, 0);        /* Reserved */
   sst_end ();
-  r.ext = 0;
-  r.length = 1;
-  r.symbolnum = N_TEXT;
-  r.pcrel = 0;
-  r.unused = 0;
+  r.r_extern = 0;
+  r.r_length = 1;
+  r.r_symbolnum = N_TEXT;
+  r.r_pcrel = 0;
+  r.r_pad = 0;
   buffer_mem (&sst_reloc, &r, sizeof (r));
 }
@@ -3039 +3039 @@
 
   for (i = 0; i < sym_count; ++i)
-    switch (sym_ptr[i].type)
+    switch (sym_ptr[i].n_type)
       {
       case N_LSYM:
@@ -3064 +3064 @@
   lbrac_index = -1; block_grow.count = 0; proc_patch_base = 0;
   for (i = 0; i < sym_count; ++i)
-    switch (sym_ptr[i].type)
+    switch (sym_ptr[i].n_type)
       {
       case N_LSYM:
@@ -3088 +3088 @@
       case N_LBRAC:
         if (lbrac_index == -1)  /* N_LBRAC without local symbols */
-          block_begin (sym_ptr[i].value);
+          block_begin (sym_ptr[i].n_value);
         else if (i != lbrac_index)
           warning ("Invalid N_LBRAC");