Changeset 609 for branches/GNU/src/binutils/bfd/aout-adobe.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/aout-adobe.c (modified) (28 diffs, 1 prop)

branches/GNU/src/binutils/bfd/aout-adobe.c

@@ -1 +1 @@
 /* BFD back-end for a.out.adobe binaries.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+   2002
    Free Software Foundation, Inc.
    Written by Cygnus Support.  Based on bout.c.
@@ -27 +28 @@
 
 #include "aout/stab_gnu.h"
-#include "libaout.h"            /* BFD a.out internal data structures */
+#include "libaout.h"            /* BFD a.out internal data structures.  */
 
 /* Forward decl.  */
 extern const bfd_target a_out_adobe_vec;
 
-static const bfd_target *aout_adobe_callback PARAMS ((bfd *));
-
-extern boolean aout_32_slurp_symbol_table PARAMS ((bfd *abfd));
-extern boolean aout_32_write_syms PARAMS ((bfd *));
-static void aout_adobe_write_section PARAMS ((bfd *abfd, sec_ptr sect));
+static const bfd_target *aout_adobe_callback
+  PARAMS ((bfd *));
+extern bfd_boolean aout_32_slurp_symbol_table
+  PARAMS ((bfd *abfd));
+extern bfd_boolean aout_32_write_syms
+  PARAMS ((bfd *));
+static void aout_adobe_write_section
+  PARAMS ((bfd *abfd, sec_ptr sect));
+static const bfd_target * aout_adobe_object_p
+  PARAMS ((bfd *));
+static bfd_boolean aout_adobe_mkobject
+  PARAMS ((bfd *));
+static bfd_boolean aout_adobe_write_object_contents
+  PARAMS ((bfd *));
+static bfd_boolean aout_adobe_set_section_contents
+  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
+static bfd_boolean aout_adobe_set_arch_mach
+  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+static int     aout_adobe_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
 
 /* Swaps the information in an executable header taken from a raw byte
@@ -42 +58 @@
 
 void aout_adobe_swap_exec_header_in
-  PARAMS ((bfd *abfd, struct external_exec *raw_bytes,
-           struct internal_exec *execp));
+  PARAMS ((bfd *, struct external_exec *, struct internal_exec *));
 
 void
@@ -54 +69 @@
 
   /* Now fill in fields in the execp, from the bytes in the raw data.  */
-  execp->a_info   = bfd_h_get_32 (abfd, bytes->e_info);
+  execp->a_info   = H_GET_32 (abfd, bytes->e_info);
   execp->a_text   = GET_WORD (abfd, bytes->e_text);
   execp->a_data   = GET_WORD (abfd, bytes->e_data);
@@ -67 +82 @@
    supplied buffer ready for writing to disk.  */
 
-PROTO(void, aout_adobe_swap_exec_header_out,
-          (bfd *abfd,
-           struct internal_exec *execp,
-           struct external_exec *raw_bytes));
+void aout_adobe_swap_exec_header_out
+  PARAMS ((bfd *, struct internal_exec *, struct external_exec *));
+
 void
 aout_adobe_swap_exec_header_out (abfd, execp, raw_bytes)
@@ -81 +95 @@
   /* Now fill in fields in the raw data, from the fields in the exec
      struct.  */
-  bfd_h_put_32 (abfd, execp->a_info  , bytes->e_info);
+  H_PUT_32 (abfd, execp->a_info  , bytes->e_info);
   PUT_WORD (abfd, execp->a_text  , bytes->e_text);
   PUT_WORD (abfd, execp->a_data  , bytes->e_data);
@@ -98 +112 @@
   struct external_exec exec_bytes;
   char *targ;
-
-  if (bfd_read ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
-      != EXEC_BYTES_SIZE)
+  bfd_size_type amt = EXEC_BYTES_SIZE;
+
+  if (bfd_bread ((PTR) &exec_bytes, amt, abfd) != amt)
     {
       if (bfd_get_error () != bfd_error_system_call)
@@ -107 +121 @@
     }
 
-  anexec.a_info = bfd_h_get_32 (abfd, exec_bytes.e_info);
+  anexec.a_info = H_GET_32 (abfd, exec_bytes.e_info);
 
   /* Normally we just compare for the magic number.
@@ -143 +157 @@
   struct external_segdesc ext[1];
   char *section_name;
-  char try_again[30];   /* name and number */
+  char try_again[30];   /* Name and number.  */
   char *newname;
   int trynum;
@@ -149 +163 @@
 
   /* Architecture and machine type -- unknown in this format.  */
-  bfd_set_arch_mach (abfd, bfd_arch_unknown, 0);
+  bfd_set_arch_mach (abfd, bfd_arch_unknown, 0L);
 
   /* The positions of the string table and symbol table.  */
@@ -156 +170 @@
 
   /* Suck up the section information from the file, one section at a time.  */
-
   for (;;)
     {
-      if (bfd_read ((PTR) ext, 1, sizeof (*ext), abfd) != sizeof (*ext))
+      bfd_size_type amt = sizeof (*ext);
+      if (bfd_bread ((PTR) ext, amt, abfd) != amt)
         {
           if (bfd_get_error () != bfd_error_system_call)
             bfd_set_error (bfd_error_wrong_format);
+
           return 0;
         }
@@ -188 +203 @@
           (*_bfd_error_handler)
             (_("%s: Unknown section type in a.out.adobe file: %x\n"),
-             bfd_get_filename (abfd), ext->e_type[0]);
+             bfd_archive_filename (abfd), ext->e_type[0]);
           goto no_more_sections;
         }
@@ -194 +209 @@
       /* First one is called ".text" or whatever; subsequent ones are
          ".text1", ".text2", ...  */
-
       bfd_set_error (bfd_error_no_error);
       sect = bfd_make_section (abfd, section_name);
       trynum = 0;
+
       while (!sect)
         {
@@ -210 +225 @@
       if (sect->name == try_again)
         {
-          newname = (char *) bfd_zalloc (abfd, strlen (sect->name));
+          amt = strlen (sect->name);
+          newname = (char *) bfd_zalloc (abfd, amt);
           if (newname == NULL)
             return 0;
@@ -221 +237 @@
       /* Assumed big-endian.  */
       sect->_raw_size = ((ext->e_size[0] << 8)
-                         | ext->e_size[1] << 8)
-        | ext->e_size[2];
+                         | ext->e_size[1] << 8
+                         | ext->e_size[2]);
       sect->_cooked_size = sect->_raw_size;
-      sect->vma = bfd_h_get_32 (abfd, ext->e_virtbase);
-      sect->filepos = bfd_h_get_32 (abfd, ext->e_filebase);
+      sect->vma = H_GET_32 (abfd, ext->e_virtbase);
+      sect->filepos = H_GET_32 (abfd, ext->e_filebase);
       /* FIXME XXX alignment?  */
 
@@ -241 +257 @@
             sect->reloc_count = execp->a_drsize;
             break;
+
+          default:
+            break;
           }
     }
@@ -254 +273 @@
 }
 
-struct bout_data_struct {
-  struct aoutdata a;
-  struct internal_exec e;
-};
-
-static boolean
+struct bout_data_struct
+  {
+    struct aoutdata a;
+    struct internal_exec e;
+  };
+
+static bfd_boolean
 aout_adobe_mkobject (abfd)
      bfd *abfd;
 {
   struct bout_data_struct *rawptr;
-
-  rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, sizeof (struct bout_data_struct));
+  bfd_size_type amt = sizeof (struct bout_data_struct);
+
+  rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, amt);
   if (rawptr == NULL)
-    return false;
+    return FALSE;
 
   abfd->tdata.bout_data = rawptr;
@@ -278 +299 @@
   adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
 
-  return true;
-}
-
-static boolean
+  return TRUE;
+}
+
+static bfd_boolean
 aout_adobe_write_object_contents (abfd)
      bfd *abfd;
@@ -288 +309 @@
   static struct external_segdesc sentinel[1];   /* Initialized to zero.  */
   asection *sect;
+  bfd_size_type amt;
 
   exec_hdr (abfd)->a_info = ZMAGIC;
@@ -325 +347 @@
   aout_adobe_swap_exec_header_out (abfd, exec_hdr (abfd), &swapped_hdr);
 
+  amt = EXEC_BYTES_SIZE;
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
-      || (bfd_write ((PTR) &swapped_hdr, 1, EXEC_BYTES_SIZE, abfd)
-          != EXEC_BYTES_SIZE))
-    return false;
+      || bfd_bwrite ((PTR) &swapped_hdr, amt, abfd) != amt)
+    return FALSE;
 
   /* Now write out the section information.  Text first, data next, rest
@@ -334 +356 @@
 
   for (sect = abfd->sections; sect; sect = sect->next)
-    {
-      if (sect->flags & SEC_CODE)
-        {
-          aout_adobe_write_section (abfd, sect);
-        }
-    }
+    if (sect->flags & SEC_CODE)
+      aout_adobe_write_section (abfd, sect);
+
   for (sect = abfd->sections; sect; sect = sect->next)
-    {
-      if (sect->flags & SEC_DATA)
-        {
-          aout_adobe_write_section (abfd, sect);
-        }
-    }
+    if (sect->flags & SEC_DATA)
+      aout_adobe_write_section (abfd, sect);
+
   for (sect = abfd->sections; sect; sect = sect->next)
-    {
-      if (!(sect->flags & (SEC_CODE | SEC_DATA)))
-        {
-          aout_adobe_write_section (abfd, sect);
-        }
-    }
+    if (!(sect->flags & (SEC_CODE | SEC_DATA)))
+      aout_adobe_write_section (abfd, sect);
 
   /* Write final `sentinel` section header (with type of 0).  */
-  if (bfd_write ((PTR) sentinel, 1, sizeof (*sentinel), abfd)
-      != sizeof (*sentinel))
-    return false;
+  amt = sizeof (*sentinel);
+  if (bfd_bwrite ((PTR) sentinel, amt, abfd) != amt)
+    return FALSE;
 
   /* Now write out reloc info, followed by syms and strings.  */
@@ -365 +377 @@
       if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (*exec_hdr (abfd))), SEEK_SET)
           != 0)
-        return false;
+        return FALSE;
 
       if (! aout_32_write_syms (abfd))
-        return false;
+        return FALSE;
 
       if (bfd_seek (abfd, (file_ptr) (N_TRELOFF (*exec_hdr (abfd))), SEEK_SET)
           != 0)
-        return false;
+        return FALSE;
 
       for (sect = abfd->sections; sect; sect = sect->next)
-        {
-          if (sect->flags & SEC_CODE)
-            {
-              if (!aout_32_squirt_out_relocs (abfd, sect))
-                return false;
-            }
-        }
+        if (sect->flags & SEC_CODE)
+          if (!aout_32_squirt_out_relocs (abfd, sect))
+            return FALSE;
 
       if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (*exec_hdr (abfd))), SEEK_SET)
           != 0)
-        return false;
+        return FALSE;
 
       for (sect = abfd->sections; sect; sect = sect->next)
-        {
-          if (sect->flags & SEC_DATA)
-            {
-              if (!aout_32_squirt_out_relocs (abfd, sect))
-                return false;
-            }
-        }
+        if (sect->flags & SEC_DATA)
+          if (!aout_32_squirt_out_relocs (abfd, sect))
+            return FALSE;
     }
-  return true;
+
+  return TRUE;
 }
 
@@ -408 +413 @@
 
 
-static boolean
+static bfd_boolean
 aout_adobe_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
@@ -420 +425 @@
 
   /* Set by bfd.c handler.  */
-  if (abfd->output_has_begun == false)
+  if (! abfd->output_has_begun)
     {
       /* Assign file offsets to sections.  Text sections are first, and
          are contiguous.  Then data sections.  Everything else at the end.  */
-
       section_start = N_TXTOFF (ignore<-->me);
 
@@ -462 +466 @@
      going.  */
   if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
-    return false;
-
-  if (count != 0)
-    {
-      return (bfd_write ((PTR) location, 1, count, abfd) == count) ? true : false;
-    }
-  return true;
-}
-
-static boolean
+    return FALSE;
+
+  if (count == 0)
+    return TRUE;
+
+  return bfd_bwrite ((PTR) location, count, abfd) == count;
+}
+
+static bfd_boolean
 aout_adobe_set_arch_mach (abfd, arch, machine)
      bfd *abfd;
@@ -478 +481 @@
 {
   if (! bfd_default_set_arch_mach (abfd, arch, machine))
-    return false;
+    return FALSE;
 
   if (arch == bfd_arch_unknown
       || arch == bfd_arch_m68k)
-    return true;
-
-  return false;
+    return TRUE;
+
+  return FALSE;
 }
 
@@ -490 +493 @@
 aout_adobe_sizeof_headers (ignore_abfd, ignore)
      bfd *ignore_abfd ATTRIBUTE_UNUSED;
-     boolean ignore ATTRIBUTE_UNUSED;
+     bfd_boolean ignore ATTRIBUTE_UNUSED;
 {
   return sizeof (struct internal_exec);
@@ -515 +518 @@
 #define aout_32_bfd_relax_section       bfd_generic_relax_section
 #define aout_32_bfd_gc_sections         bfd_generic_gc_sections
+#define aout_32_bfd_merge_sections      bfd_generic_merge_sections
+#define aout_32_bfd_discard_group       bfd_generic_discard_group
 #define aout_32_bfd_link_hash_table_create \
   _bfd_generic_link_hash_table_create
+#define aout_32_bfd_link_hash_table_free \
+  _bfd_generic_link_hash_table_free
 #define aout_32_bfd_link_add_symbols    _bfd_generic_link_add_symbols
+#define aout_32_bfd_link_just_syms      _bfd_generic_link_just_syms
 #define aout_32_bfd_final_link          _bfd_generic_final_link
 #define aout_32_bfd_link_split_section  _bfd_generic_link_split_section
 
-const bfd_target a_out_adobe_vec = {
-  "a.out.adobe",                /* name */
-  bfd_target_aout_flavour,
-  BFD_ENDIAN_BIG,               /* data byte order is unknown (big assumed) */
-  BFD_ENDIAN_BIG,               /* hdr byte order is big */
-  (HAS_RELOC | EXEC_P |         /* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT ),
-  /* section flags */
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_DATA | SEC_RELOC),
-  '_',                          /*  symbol leading char */
-  ' ',                          /* ar_pad_char */
-  16,                           /* ar_max_namelen */
-
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,   /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,   /* hdrs */
-  {_bfd_dummy_target, aout_adobe_object_p,      /* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
-  {bfd_false, aout_adobe_mkobject,      /* bfd_set_format */
-   _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, aout_adobe_write_object_contents, /* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-  BFD_JUMP_TABLE_GENERIC (aout_32),
-  BFD_JUMP_TABLE_COPY (_bfd_generic),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd),
-  BFD_JUMP_TABLE_SYMBOLS (aout_32),
-  BFD_JUMP_TABLE_RELOCS (aout_32),
-  BFD_JUMP_TABLE_WRITE (aout_32),
-  BFD_JUMP_TABLE_LINK (aout_32),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  NULL,
-
-  (PTR) 0
-};
+const bfd_target a_out_adobe_vec =
+  {
+    "a.out.adobe",              /* name */
+    bfd_target_aout_flavour,
+    BFD_ENDIAN_BIG,             /* data byte order is unknown (big assumed) */
+    BFD_ENDIAN_BIG,             /* hdr byte order is big */
+    (HAS_RELOC | EXEC_P |       /* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT ),
+    /* section flags */
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_DATA | SEC_RELOC),
+    '_',                                /*  symbol leading char */
+    ' ',                                /* ar_pad_char */
+    16,                                 /* ar_max_namelen */
+
+    bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+    bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
+    bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+    bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
+    {_bfd_dummy_target, aout_adobe_object_p,    /* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+    {bfd_false, aout_adobe_mkobject,            /* bfd_set_format */
+     _bfd_generic_mkarchive, bfd_false},
+    {bfd_false, aout_adobe_write_object_contents,/* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+    BFD_JUMP_TABLE_GENERIC (aout_32),
+    BFD_JUMP_TABLE_COPY (_bfd_generic),
+    BFD_JUMP_TABLE_CORE (_bfd_nocore),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd),
+    BFD_JUMP_TABLE_SYMBOLS (aout_32),
+    BFD_JUMP_TABLE_RELOCS (aout_32),
+    BFD_JUMP_TABLE_WRITE (aout_32),
+    BFD_JUMP_TABLE_LINK (aout_32),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    NULL,
+
+    (PTR) 0
+  };