Changeset 729 for trunk/src/binutils/bfd/i386aoutemx.c

Timestamp:

Sep 25, 2003, 9:27:01 PM (22 years ago)

Author:

zap

Message:

.

File:

• trunk/src/binutils/bfd/i386aoutemx.c (modified) (4 diffs, 1 prop)

trunk/src/binutils/bfd/i386aoutemx.c

@@ -18 +18 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include "sysdep.h"
-#include "bfd.h"
-#include "libbfd.h"
-#include "libaout.h"
+#define EMX
 
-static bfd_boolean MY(set_sizes) ();
+#define ARCH_SIZE               32
+#define DEFAULT_ARCH            bfd_arch_i386
+
+#define TEXT_START_ADDR         0x10000
+#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 IS_STAB(flags) (((flags) & N_STAB) \
+        && (flags) != (N_IMP1|N_EXT) && (flags) != (N_IMP2|N_EXT))
+
+#include "aout/aoutemx.h"
+#include "aoutx.h"
+
+#define MY_object_p             MY(object_p)
 #define MY_backend_data &MY(backend_data)
 
-static const bfd_target *MY(object_p) ();
-#define MY_object_p             MY(object_p)
+static bfd_boolean MY(set_sizes) PARAMS ((bfd *));
+static const bfd_target *MY(object_p) PARAMS ((bfd *));
 
 static CONST struct aout_backend_data MY(backend_data) = {
@@ -47 +65 @@
 #include "aout-target.h"
 
+#ifndef __EMX__
+
+/* Cross-compilation support, borrowed from EMX C runtime library */
+int _fseek_hdr PARAMS ((FILE *));
+
+int _fseek_hdr (FILE *stream)
+{
+  struct
+    {
+      char magic[2];
+      char fill1[6];
+      unsigned short hdr_size;
+    } exe_hdr;
+  struct
+    {
+      char sig[16];
+      char bound;
+      char fill1;
+      unsigned short hdr_loc_lo;      /* cannot use long, alignment! */
+      unsigned short hdr_loc_hi;
+    } patch;
+  long original_pos;
+  int saved_errno;
+
+  original_pos = ftell (stream);
+  if (fread (&exe_hdr, sizeof (exe_hdr), 1, stream) != 1)
+    goto failure;
+  if (memcmp (exe_hdr.magic, "MZ", 2) != 0)
+    return (fseek (stream, original_pos, SEEK_SET) == -1 ? -1 : 0);
+  if (fseek (stream, original_pos + 16 * exe_hdr.hdr_size, SEEK_SET) == -1)
+    goto failure;
+  if (fread (&patch, sizeof (patch), 1, stream) != 1)
+    goto failure;
+  if (memcmp (patch.sig, "emx", 3) != 0)
+    goto failure;
+  if (fseek (stream, original_pos + patch.hdr_loc_lo
+             + 65536L * patch.hdr_loc_hi, SEEK_SET) == -1)
+    goto failure;
+  return 0;
+
+failure:
+  saved_errno = errno;
+  fseek (stream, original_pos, SEEK_SET);
+  errno = saved_errno;
+  return -1;
+}
+#endif
+
 /*
  * Finish up the reading of an a.out file header
@@ -62 +128 @@
   (void)_fseek_hdr(bfd_cache_lookup(abfd));
   add = bfd_tell (abfd) - org_pos;
-  if (bfd_read ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
+
+  if (bfd_bread ((PTR) &exec_bytes, EXEC_BYTES_SIZE, abfd)
       != EXEC_BYTES_SIZE)
   {
@@ -76 +143 @@
 
   NAME(aout,swap_exec_header_in)(abfd, &exec_bytes, &exec);
-  exec.emx_add = add;
+  exec.a_hdrofs = add;
   target = NAME(aout,some_aout_object_p) (abfd, &exec, MY(callback));
   return target;