Changeset 609 for branches/GNU/src/binutils/bfd/coff-stgo32.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/bfd/coff-stgo32.c (modified) (20 diffs, 1 prop)

branches/GNU/src/binutils/bfd/coff-stgo32.c

@@ -1 +1 @@
 /* BFD back-end for Intel 386 COFF files (DJGPP variant with a stub).
-   Copyright 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Written by Robert Hoehne.
 
@@ -33 +33 @@
 
    To be compatible with any existing executables I have fixed this
-   here and NOT in the DJGPP startup code.
- */
+   here and NOT in the DJGPP startup code.  */
 
 #define TARGET_SYM              go32stubbedcoff_vec
@@ -48 +47 @@
   COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
 { COFF_SECTION_NAME_EXACT_MATCH (".text"), \
-  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
 
 #include "bfd.h"
 
-/* At first the prototypes */
-
-static void
-adjust_filehdr_in_post PARAMS ((bfd * abfd, PTR src, PTR dst));
-static void
-adjust_filehdr_out_pre PARAMS ((bfd * abfd, PTR in, PTR out));
-static void
-adjust_filehdr_out_post PARAMS ((bfd * abfd, PTR in, PTR out));
-
-static void
-adjust_scnhdr_in_post PARAMS ((bfd * abfd, PTR ext, PTR in));
-static void
-adjust_scnhdr_out_pre PARAMS ((bfd * abfd, PTR in, PTR out));
-static void
-adjust_scnhdr_out_post PARAMS ((bfd * abfd, PTR in, PTR out));
-
-static void
-adjust_aux_in_post PARAMS ((bfd * abfd, PTR ext1, int type, int class, int indx,
-                            int numaux, PTR in1));
-static void
-adjust_aux_out_pre PARAMS ((bfd * abfd, PTR inp, int type, int class, int indx,
-                            int numaux, PTR extp));
-static void
-adjust_aux_out_post PARAMS ((bfd * abfd, PTR inp, int type, int class, int indx,
-                             int numaux, PTR extp));
-
-static void
-create_go32_stub PARAMS ((bfd * abfd));
-
-/*
-   All that ..._PRE and ...POST functions are called from the corresponding
+/* At first the prototypes.  */
+
+static void
+adjust_filehdr_in_post PARAMS ((bfd *, PTR, PTR));
+static void
+adjust_filehdr_out_pre PARAMS ((bfd *, PTR, PTR));
+static void
+adjust_filehdr_out_post PARAMS ((bfd *, PTR, PTR));
+static void
+adjust_scnhdr_in_post PARAMS ((bfd *, PTR, PTR));
+static void
+adjust_scnhdr_out_pre PARAMS ((bfd *, PTR, PTR));
+static void
+adjust_scnhdr_out_post PARAMS ((bfd *, PTR, PTR));
+static void
+adjust_aux_in_post PARAMS ((bfd *, PTR, int, int, int, int, PTR));
+static void
+adjust_aux_out_pre PARAMS ((bfd *, PTR, int, int, int, int, PTR));
+static void
+adjust_aux_out_post PARAMS ((bfd *, PTR, int, int, int, int, PTR));
+static void
+create_go32_stub PARAMS ((bfd *));
+
+/* All that ..._PRE and ...POST functions are called from the corresponding
    coff_swap... functions. The ...PRE functions are called at the beginning
-   of the function and the ...POST functions at the end of the swap routines.
- */
+   of the function and the ...POST functions at the end of the swap routines.  */
 
 #define COFF_ADJUST_FILEHDR_IN_POST adjust_filehdr_in_post
@@ -99 +94 @@
 #define COFF_ADJUST_AUX_OUT_POST adjust_aux_out_post
 
-static boolean
-  go32_stubbed_coff_bfd_copy_private_bfd_data PARAMS ((bfd * ibfd, bfd * obfd));
+static bfd_boolean
+  go32_stubbed_coff_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
 
 #define coff_bfd_copy_private_bfd_data go32_stubbed_coff_bfd_copy_private_bfd_data
@@ -106 +101 @@
 #include "coff-i386.c"
 
-/* I hold in the usrdata the stub */
+/* I hold in the usrdata the stub.  */
 #define bfd_coff_go32stub bfd_usrdata
 
 /* This macro is used, because I cannot assume the endianess of the
-   host system */
-#define _H(index) (bfd_h_get_16(abfd, (bfd_byte *) (header+index*2)))
+   host system.  */
+#define _H(index) (H_GET_16 (abfd, (header+index*2)))
 
 /* These bytes are a 2048-byte DOS executable, which loads the COFF
-   image into memory and then runs it. It is called 'stub' */
-
-static unsigned char stub_bytes[STUBSIZE] =
+   image into memory and then runs it. It is called 'stub'.  */
+
+static const unsigned char stub_bytes[STUBSIZE] =
 {
 #include "go32stub.h"
@@ -126 +121 @@
    all the pointers are adjusted by adding STUBSIZE and for the
    ...out function, it is subtracted first and after calling the
-   standard swap function it is reset to the old value */
+   standard swap function it is reset to the old value.  */
 
 /* This macro is used for adjusting the filepointers, which
-   is done only, if the pointer is nonzero */
+   is done only, if the pointer is nonzero.  */
 
 #define ADJUST_VAL(val,diff) \
@@ -145 +140 @@
   ADJUST_VAL (filehdr_dst->f_symptr, STUBSIZE);
 
-  /* Save now the stub to be used later */
-  bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, STUBSIZE);
+  /* Save now the stub to be used later.  */
+  bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, (bfd_size_type) STUBSIZE);
 
   /* Since this function returns no status, I do not set here
      any bfd_error_...
      That means, before the use of bfd_coff_go32stub (), this value
-     should be checked if it is != NULL */
+     should be checked if it is != NULL.  */
   if (bfd_coff_go32stub (abfd) == NULL)
     return;
@@ -166 +161 @@
   FILHDR *filehdr_out = (FILHDR *) out;
 
-  /* Generate the stub */
+  /* Generate the stub.  */
   create_go32_stub (abfd);
 
-  /* Copy the stub to the file header */
+  /* Copy the stub to the file header.  */
   if (bfd_coff_go32stub (abfd) != NULL)
     memcpy (filehdr_out->stub, bfd_coff_go32stub (abfd), STUBSIZE);
   else
-    /* use the default */
+    /* Use the default.  */
     memcpy (filehdr_out->stub, stub_bytes, STUBSIZE);
 
@@ -186 +181 @@
 {
   struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
-  /* undo the above change */
+  /* Undo the above change.  */
   ADJUST_VAL (filehdr_in->f_symptr, STUBSIZE);
 }
@@ -283 +278 @@
 }
 
-/*
-   That's the function, which creates the stub. There are
+/* That's the function, which creates the stub. There are
    different cases from where the stub is taken.
    At first the environment variable $(GO32STUB) is checked and then
@@ -294 +288 @@
 
    If there was any error, the standard stub (compiled in this file)
-   is taken.
- */
+   is taken.  */
 
 static void
@@ -301 +294 @@
      bfd *abfd;
 {
-  /* Do it only once */
+  /* Do it only once.  */
   if (bfd_coff_go32stub (abfd) == NULL)
     {
@@ -309 +302 @@
       unsigned char header[10];
       char magic[8];
-      unsigned long coff_start, exe_start;
-
-      /* Check at first the environment variable $(GO32STUB) */
+      unsigned long coff_start;
+      long exe_start;
+
+      /* Check at first the environment variable $(GO32STUB).  */
       stub = getenv ("GO32STUB");
-      /* Now check the environment variable $(STUB) */
+      /* Now check the environment variable $(STUB).  */
       if (stub == NULL)
         stub = getenv ("STUB");
@@ -332 +326 @@
           goto stub_end;
         }
-      if (_H (0) != 0x5a4d)     /* it is not an exe file */
+      if (_H (0) != 0x5a4d)     /* It is not an exe file.  */
         {
           close (f);
@@ -338 +332 @@
         }
       /* Compute the size of the stub (it is every thing up
-         to the beginning of the coff image) */
+         to the beginning of the coff image).  */
       coff_start = (long) _H (2) * 512L;
       if (_H (1))
@@ -344 +338 @@
 
       /* Currently there is only a fixed stub size of 2048 bytes
-         supported */
+         supported.  */
       if (coff_start != 2048)
         {
@@ -351 +345 @@
         }
       exe_start = _H (4) * 16;
-      if ((unsigned long) lseek (f, exe_start, SEEK_SET) != exe_start)
+      if ((long) lseek (f, exe_start, SEEK_SET) != exe_start)
         {
           close (f);
@@ -366 +360 @@
           goto stub_end;
         }
-      /* Now we found a correct stub (hopefully) */
-      bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, coff_start);
+      /* Now we found a correct stub (hopefully).  */
+      bfd_coff_go32stub (abfd)
+        = (PTR) bfd_alloc (abfd, (bfd_size_type) coff_start);
       if (bfd_coff_go32stub (abfd) == NULL)
         {
@@ -384 +379 @@
 stub_end:
   /* There was something wrong above, so use now the standard builtin
-     stub */
+     stub.  */
   if (bfd_coff_go32stub (abfd) == NULL)
     {
-      bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, STUBSIZE);
+      bfd_coff_go32stub (abfd)
+        = (PTR) bfd_alloc (abfd, (bfd_size_type) STUBSIZE);
       if (bfd_coff_go32stub (abfd) == NULL)
-        {
-          return;
-        }
-
+        return;
       memcpy (bfd_coff_go32stub (abfd), stub_bytes, STUBSIZE);
     }
@@ -398 +391 @@
 
 /* If ibfd was a stubbed coff image, copy the stub from that bfd
-   to the new obfd.
- */
-
-static boolean
+   to the new obfd.  */
+
+static bfd_boolean
 go32_stubbed_coff_bfd_copy_private_bfd_data  (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
-  /* check if both are the same targets */
+  /* Check if both are the same targets.  */
   if (ibfd->xvec != obfd->xvec)
-    return true;
-
-  /* check if both have a valid stub */
+    return TRUE;
+
+  /* Check if both have a valid stub.  */
   if (bfd_coff_go32stub (ibfd) == NULL
       || bfd_coff_go32stub (obfd) == NULL)
-    return true;
-
-  /* Now copy the stub */
+    return TRUE;
+
+  /* Now copy the stub.  */
   memcpy (bfd_coff_go32stub (obfd), bfd_coff_go32stub (ibfd), STUBSIZE);
 
-  return true;
-}
+  return TRUE;
+}