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

Timestamp:

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

Author:

zap

Message:

See ChangeLog.

File:

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

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

@@ -28 +28 @@
 #include <sys/param.h>
 #include <sys/emxload.h>
+#include <sys/omflib.h>
 #include <ar.h>
+#include <a_out.h>
 
 #define GROW_DEF_STATIC(NAME,TYPE) \
@@ -42 +44 @@
   (grow_by (&NAME##_grow, 1), NAME##_grow.count++)
 
-/* The version number of this program.  This is printed with the usage
-   message. */
-
-#define VERSION "0.9d"
-#include "../../../../include/innotekversion.h"
-
 /* Insert private header files. */
 
@@ -150 +146 @@
 GROW_DEF_STATIC (extdefs, struct extdef);
 GROW_DEF_STATIC (symbols, struct symbol);
-GROW_DEF_STATIC (trelocs, struct reloc);
-GROW_DEF_STATIC (drelocs, struct reloc);
+GROW_DEF_STATIC (trelocs, struct relocation_info);
+GROW_DEF_STATIC (drelocs, struct relocation_info);
 
 
@@ -212 +208 @@
 {
   void *p;
-
+  
   p = malloc (n);
   if (p == NULL && n != 0)
@@ -227 +223 @@
 {
   void *p;
-
+  
   p = realloc (ptr, n);
   if (p == NULL)
@@ -242 +238 @@
 {
   char *p;
-
+  
   p = xmalloc (strlen (s) + 1);
   strcpy (p, s);
@@ -268 +264 @@
 static void usage (void)
 {
-  puts ("emxaout " VERSION INNOTEK_VERSION " -- Copyright (c) 1994-1996 by Eberhard Mattes\n");
+  puts ("emxaout " VERSION " -- Copyright (c) 1994-1996 by Eberhard Mattes\n");
   puts ("Usage:");
   puts ("  emxaout [-u] [-o <output_file>] <input_file>");
@@ -706 +702 @@
    ³n   External name
    ³1-2 Type index
-   À
+   À 
 
    Symbol indices are assigned sequentially by EXTDEF and COMDEF. */
@@ -936 +932 @@
     F (bit 7)           1=frame thread, 0=methods F0 through F5
     Frame (bits 4-6)    frame thread number (F=1) or frame method (F=0)
-    T (bit 3)           1=target thread, 1=methods
+    T (bit 3)           1=target thread, 1=methods 
     P (bit 2)           Bit 2 of target method
     Targt (bits 0-1)    target thread number (T=1) or target method (T=0) */
@@ -945 +941 @@
   int frame_method, frame_index, target_method, target_index;
   dword disp;
-  struct reloc r;
+  struct relocation_info r;
   struct thread th;
 
@@ -958 +954 @@
           fix_data = get_byte ();
           if (first & 0x40)
-            r.pcrel = 0;
+            r.r_pcrel = 0;
           else
-            r.pcrel = 1;
-          r.address = offset + cur_off;
-          r.unused = 0;
+            r.r_pcrel = 1;
+          r.r_address = offset + cur_off;
+          r.r_pad = 0;
           locat = (first >> 2) & 0x0f;
           if (fix_data & 0x80)
@@ -1015 +1011 @@
                   error2 ("FIXUPP: OFFSET-16(LR) fixup not supported");
                 case 9:
-                  r.length = 2;
+                  r.r_length = 2;
                   break;
                 case 11:
@@ -1028 +1024 @@
                 {
                 case 0:         /* T0: SEGDEF */
-                  r.ext = 0;
+                  r.r_extern = 0;
                   if (target_index == seg_code + 1)
-                    r.symbolnum = N_TEXT;
+                    r.r_symbolnum = N_TEXT;
                   else if (target_index == seg_data + 1)
                     {
-                      r.symbolnum = N_DATA;
+                      r.r_symbolnum = N_DATA;
                       disp += (seg_code >= 0 ? segments[seg_code].size : 0);
                     }
                   else if (target_index == seg_bss + 1)
                     {
-                      r.symbolnum = N_BSS;
+                      r.r_symbolnum = N_BSS;
                       disp += (seg_code >= 0 ? segments[seg_code].size : 0);
                       disp += (seg_data >= 0 ? segments[seg_data].size : 0);
@@ -1050 +1046 @@
                   break;
                 case 2:         /* T2: EXTDEF */
-                  r.ext = 1;
+                  r.r_extern = 1;
                   if (target_index < 1 || target_index > GROW_COUNT (extdefs))
                     error2 ("FIXUPP: EXTDEF index out of range");
-                  r.symbolnum = target_index - 1;
+                  r.r_symbolnum = target_index - 1;
                   break;
                 default:
@@ -1085 +1081 @@
                 abort ();
 
-              if (r.address + 4 > segments[cur_seg].size)
+              if (r.r_address + 4 > segments[cur_seg].size)
                 error2 ("FIXUPP: fixup beyond end of segment");
-              *((dword *)(segments[cur_seg].data + r.address))
-                += r.pcrel ? disp - (r.address + 4) : disp;
+              *((dword *)(segments[cur_seg].data + r.r_address))
+                += r.r_pcrel ? disp - (r.r_address + 4) : disp;
             }
         }
@@ -1127 +1123 @@
   for (i = 0; i < GROW_COUNT (extdefs); ++i)
     {
-      n.type = N_EXT;
-      n.string = 0;
-      n.value = extdefs[i].size;
-      n.other = 0;
-      n.desc = 0;
+      n.n_type = N_EXT;
+      n.n_un.n_strx = 0;
+      n.n_value = extdefs[i].size;
+      n.n_other = 0;
+      n.n_desc = 0;
       j = GROW_ADD (symbols);
       symbols[j].name = xstrdup (extdefs[i].name);
@@ -1143 +1139 @@
         skip = TRUE;
       else if (pubdefs[i].seg == seg_code + 1)
-        n.type = N_TEXT | N_EXT;
+        n.n_type = N_TEXT | N_EXT;
       else if (pubdefs[i].seg == seg_data + 1)
-        n.type = N_DATA | N_EXT;
+        n.n_type = N_DATA | N_EXT;
       else
         skip = TRUE;
       if (!skip)
         {
-          n.string = 0;
-          n.value = pubdefs[i].offset;
-          n.other = 0;
-          n.desc = 0;
+          n.n_un.n_strx = 0;
+          n.n_value = pubdefs[i].offset;
+          n.n_other = 0;
+          n.n_desc = 0;
           j = GROW_ADD (symbols);
           symbols[j].name = xstrdup (pubdefs[i].name);
@@ -1173 +1169 @@
     {
       if (symbols[i].name == NULL)
-        symbols[i].n.string = 0;
+        symbols[i].n.n_un.n_strx = 0;
       else
         {
-          symbols[i].n.string = str_size;
+          symbols[i].n.n_un.n_strx = str_size;
           str_size += strlen (symbols[i].name) + 1;
         }
@@ -1192 +1188 @@
 static void conv_modend (void)
 {
-  struct a_out_header h;
+  struct exec h;
   int i;
 
   make_symtab ();
-  h.magic = 0407;
-  h.machtype = 0;
-  h.flags = 0;
-  h.text_size = (seg_code >= 0 ? segments[seg_code].size : 0);
-  h.data_size = (seg_data >= 0 ? segments[seg_data].size : 0);
-  h.bss_size =  (seg_bss  >= 0 ? segments[seg_bss ].size : 0);
-  h.sym_size = GROW_COUNT (symbols) * sizeof (struct nlist);
-  h.entry = 0;
-  h.trsize = GROW_COUNT (trelocs) * sizeof (struct reloc);
-  h.drsize = GROW_COUNT (drelocs) * sizeof (struct reloc);
+  N_SET_MAGIC (h, OMAGIC);
+  N_SET_MACHTYPE (h, 0);
+  N_SET_FLAGS (h, 0);
+  h.a_text = (seg_code >= 0 ? segments[seg_code].size : 0);
+  h.a_data = (seg_data >= 0 ? segments[seg_data].size : 0);
+  h.a_bss =  (seg_bss  >= 0 ? segments[seg_bss ].size : 0);
+  h.a_syms = GROW_COUNT (symbols) * sizeof (struct nlist);
+  h.a_entry = 0;
+  h.a_trsize = GROW_COUNT (trelocs) * sizeof (struct relocation_info);
+  h.a_drsize = GROW_COUNT (drelocs) * sizeof (struct relocation_info);
   fwrite (&h, sizeof (h), 1, out_file);
   if (seg_code >= 0)
@@ -1212 +1208 @@
     fwrite (segments[seg_data].data, segments[seg_data].size, 1, out_file);
   for (i = 0; i < GROW_COUNT (trelocs); ++i)
-    fwrite (&trelocs[i], sizeof (struct reloc), 1, out_file);
+    fwrite (&trelocs[i], sizeof (struct relocation_info), 1, out_file);
   for (i = 0; i < GROW_COUNT (drelocs); ++i)
-    fwrite (&drelocs[i], sizeof (struct reloc), 1, out_file);
+    fwrite (&drelocs[i], sizeof (struct relocation_info), 1, out_file);
   write_symtab ();
 }