Changeset 1256

Timestamp:

Feb 16, 2004, 4:49:31 AM (21 years ago)

Author:

bird

Message:

Cleaned this up as Andy already tried to do.

Location:

trunk/src/binutils/bfd

Files:

• hosts/i386emx.h (modified) (3 diffs, 1 prop)
• i386aoutemx.c (modified) (5 diffs, 1 prop)

trunk/src/binutils/bfd/hosts/i386emx.h

@@ -6 +6 @@
 #define EMX
 
-#define DEFAULT_ARCH            bfd_arch_i386
-
-#define TARGET_PAGE_SIZE        0x1000
-#define TARGET_SEGMENT_SIZE     0x10000
-#define TEXT_START_ADDR         0x10000
-#define TARGET_STACK_END_ADDR   0x80000000
-
 #define HOST_PAGE_SIZE          0x1000
 #define HOST_SEGMENT_SIZE       0x10000
@@ -18 +11 @@
 #define HOST_STACK_END_ADDR     0x80000000
 
+#ifndef TEXT_START_ADDR /* bird: does this need to be BFD wide? */
+#define TEXT_START_ADDR         0x10000
+#endif
+
+#define NO_CORE_COMMAND
+
+#if 0 /* moved to i386aoutemx.c */
+
+#define DEFAULT_ARCH            bfd_arch_i386
+
+#define TARGET_PAGE_SIZE        0x1000
+#define TARGET_SEGMENT_SIZE     0x10000
+#define TARGET_STACK_END_ADDR   0x80000000
 
 #define ZMAGIC_DISK_BLOCK_SIZE  1024
 #define BYTES_IN_WORD           4
-#define NO_CORE_COMMAND
 
 #define MY(OP)                  CONCAT2(i386aout_emx_,OP)
 #define TARGETNAME              "a.out-emx"
 #define NO_WRITE_HEADER_KLUDGE  1
-
-/* a.out executables emx-specific header */
-struct exec
-{
-  unsigned long a_info;         /* Use macros N_MAGIC, etc for access */
-  unsigned a_text;              /* length of text, in bytes */
-  unsigned a_data;              /* length of data, in bytes */
-  unsigned a_bss;               /* length of uninitialized data area for file, in bytes */
-  unsigned a_syms;              /* length of symbol table data in file, in bytes */
-  unsigned a_entry;             /* start address */
-  unsigned a_trsize;            /* length of relocation info for text, in bytes */
-  unsigned a_drsize;            /* length of relocation info for data, in bytes */
-};
 
 #define N_HEADER_IN_TEXT(x) 0
@@ -52 +44 @@
 #define N_DATOFF(x) (N_TXTOFF(x) + N_TXTSIZE(x))
 
+#endif /* moved to i386aoutemx.c */
+
+/* a.out executables emx-specific header */
+struct exec                     /* bird: should this be BFD wide or only for the emx target? */
+{
+  unsigned long a_info;         /* Use macros N_MAGIC, etc for access */
+  unsigned a_text;              /* length of text, in bytes */
+  unsigned a_data;              /* length of data, in bytes */
+  unsigned a_bss;               /* length of uninitialized data area for file, in bytes */
+  unsigned a_syms;              /* length of symbol table data in file, in bytes */
+  unsigned a_entry;             /* start address */
+  unsigned a_trsize;            /* length of relocation info for text, in bytes */
+  unsigned a_drsize;            /* length of relocation info for data, in bytes */
+};
+
+ /* bird: should this be BFD wide or only for the emx target? */
 #define IS_STAB(flags) (((flags) & N_STAB) \
         && (flags) != (N_IMP1|N_EXT) && (flags) != (N_IMP2|N_EXT))

trunk/src/binutils/bfd/i386aoutemx.c

@@ -23 +23 @@
 #endif
 #include "bfd.h"
-#include "libbfd.h"
+
 #ifndef EMX
 #error "EMX TARGET! EMX isn't defined!!!"
 #endif
+
+
+/* Avoid multiple defininitions from aoutx if supporting standarad a.out
+   as well as our own.  */
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define NAME(x,y)               CONCAT3(i386aout_emx,_32_,y)
+
+/* previously in hosts/i386emx.h */
+#define DEFAULT_ARCH            bfd_arch_i386
+
+#define MY(OP)                  CONCAT2(i386aout_emx_,OP)
+#define TARGETNAME              "a.out-emx"
+
+#define TARGET_PAGE_SIZE        0x1000
+#define TARGET_SEGMENT_SIZE     0x10000
+#define TEXT_START_ADDR         0x10000
+#define TARGET_STACK_END_ADDR   0x80000000
+
+#define HOST_PAGE_SIZE          0x1000
+#define HOST_SEGMENT_SIZE       0x10000
+#define HOST_TEXT_START_ADDR    0x10000
+#define HOST_STACK_END_ADDR     0x80000000
+
+
+#define ZMAGIC_DISK_BLOCK_SIZE  1024
+#define BYTES_IN_WORD           4
+#define NO_CORE_COMMAND
+
+#define NO_WRITE_HEADER_KLUDGE  1
+
+#define N_HEADER_IN_TEXT(x) 0
+
+#define N_TXTOFF(x)     \
+    (N_MAGIC(x) != ZMAGIC ? EXEC_BYTES_SIZE : /* object file or NMAGIC */\
+     N_SHARED_LIB(x) ? 0 : \
+     N_HEADER_IN_TEXT(x) ?      \
+            EXEC_BYTES_SIZE :                   /* no padding */\
+            0x400 + (x).a_hdrofs \
+    )
+
+#define N_DATOFF(x) (N_TXTOFF(x) + N_TXTSIZE(x))
+
+#define IS_STAB(flags) (((flags) & N_STAB) \
+        && (flags) != (N_IMP1|N_EXT) && (flags) != (N_IMP2|N_EXT))
+
+/* end of old hosts/i386emx.h */
+
 
 #include <symcat.h>
@@ -42 +91 @@
 /*reloc_howto_type *  MY(reloc_howto) PARAMS ((bfd *, struct reloc_std_external *, int *, int *, int *));*/
 
-reloc_howto_type MY(howto_table_std)[] =
+reloc_howto_type MY(howto_table)[] =
 {
   /* type              rs size bsz  pcrel bitpos ovrf                     sf                name      part_inpl readmask  setmask    pcdone.  */
@@ -104 +153 @@
   0                             /* finish_dynamic_link */
 };
+
+#define MY_get_section_contents _bfd_generic_get_section_contents
+#include "aoutx.h"
 
 #include "aout-target.h"
@@ -197 +249 @@
      bfd_reloc_code_real_type code;
 {
-#define STD(i, j)       case i: return &MY(howto_table_std)[j]
+#undef STD
+#define STD(i, j)       case i: return &MY(howto_table)[j]
 
   if (obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE)
@@ -267 +320 @@
 }
 
+
+