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

branches/GNU/src/binutils/bfd/i386os9k.c

@@ -1 +1 @@
 /* BFD back-end for os9000 i386 binaries.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002
    Free Software Foundation, Inc.
    Written by Cygnus Support.
@@ -28 +28 @@
 #include "os9k.h"
 
-static const bfd_target *os9k_callback PARAMS ((bfd *));
+static const bfd_target * os9k_callback
+  PARAMS ((bfd *));
+static const bfd_target * os9k_object_p
+  PARAMS ((bfd *));
+static int os9k_sizeof_headers
+  PARAMS ((bfd *, bfd_boolean));
+bfd_boolean os9k_swap_exec_header_in
+  PARAMS ((bfd *, mh_com *, struct internal_exec *));
 
 /* Swaps the information in an executable header taken from a raw byte
    stream memory image, into the internal exec_header structure.  */
-boolean
+bfd_boolean
 os9k_swap_exec_header_in (abfd, raw_bytes, execp)
      bfd *abfd;
@@ -42 +49 @@
 
   /* Now fill in fields in the execp, from the bytes in the raw data.  */
-  execp->a_info = bfd_h_get_16 (abfd, bytes->m_sync);
+  execp->a_info = H_GET_16 (abfd, bytes->m_sync);
   execp->a_syms = 0;
-  execp->a_entry = bfd_h_get_32 (abfd, bytes->m_exec);
+  execp->a_entry = H_GET_32 (abfd, bytes->m_exec);
   execp->a_talign = 2;
   execp->a_dalign = 2;
   execp->a_balign = 2;
 
-  dload = bfd_h_get_32 (abfd, bytes->m_idata);
+  dload = H_GET_32 (abfd, bytes->m_idata);
   execp->a_data = dload + 8;
 
   if (bfd_seek (abfd, (file_ptr) dload, SEEK_SET) != 0
-      || (bfd_read (&dmemstart, sizeof (dmemstart), 1, abfd)
+      || (bfd_bread (&dmemstart, (bfd_size_type) sizeof (dmemstart), abfd)
           != sizeof (dmemstart))
-      || (bfd_read (&dmemsize, sizeof (dmemsize), 1, abfd)
+      || (bfd_bread (&dmemsize, (bfd_size_type) sizeof (dmemsize), abfd)
           != sizeof (dmemsize)))
-    return false;
+    return FALSE;
 
   execp->a_tload = 0;
-  execp->a_dload = bfd_h_get_32 (abfd, (unsigned char *) &dmemstart);
+  execp->a_dload = H_GET_32 (abfd, (unsigned char *) &dmemstart);
   execp->a_text = dload - execp->a_tload;
-  execp->a_data = bfd_h_get_32 (abfd, (unsigned char *) &dmemsize);
-  execp->a_bss = bfd_h_get_32 (abfd, bytes->m_data) - execp->a_data;
+  execp->a_data = H_GET_32 (abfd, (unsigned char *) &dmemsize);
+  execp->a_bss = H_GET_32 (abfd, bytes->m_data) - execp->a_data;
 
   execp->a_trsize = 0;
   execp->a_drsize = 0;
 
-  return true;
+  return TRUE;
 }
 
@@ -75 +82 @@
    supplied buffer ready for writing to disk.  */
 
-PROTO (void, os9k_swap_exec_header_out,
-         (bfd * abfd,
-          struct internal_exec * execp,
-          struct mh_com * raw_bytes));
+void os9k_swap_exec_header_out
+  PARAMS ((bfd *, struct internal_exec *, struct mh_com *));
+
 void
 os9k_swap_exec_header_out (abfd, execp, raw_bytes)
@@ -88 +94 @@
 
   /* 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);
-  bfd_h_put_32 (abfd, execp->a_text, bytes->e_text);
-  bfd_h_put_32 (abfd, execp->a_data, bytes->e_data);
-  bfd_h_put_32 (abfd, execp->a_bss, bytes->e_bss);
-  bfd_h_put_32 (abfd, execp->a_syms, bytes->e_syms);
-  bfd_h_put_32 (abfd, execp->a_entry, bytes->e_entry);
-  bfd_h_put_32 (abfd, execp->a_trsize, bytes->e_trsize);
-  bfd_h_put_32 (abfd, execp->a_drsize, bytes->e_drsize);
-  bfd_h_put_32 (abfd, execp->a_tload, bytes->e_tload);
-  bfd_h_put_32 (abfd, execp->a_dload, bytes->e_dload);
+  H_PUT_32 (abfd, execp->a_info, bytes->e_info);
+  H_PUT_32 (abfd, execp->a_text, bytes->e_text);
+  H_PUT_32 (abfd, execp->a_data, bytes->e_data);
+  H_PUT_32 (abfd, execp->a_bss, bytes->e_bss);
+  H_PUT_32 (abfd, execp->a_syms, bytes->e_syms);
+  H_PUT_32 (abfd, execp->a_entry, bytes->e_entry);
+  H_PUT_32 (abfd, execp->a_trsize, bytes->e_trsize);
+  H_PUT_32 (abfd, execp->a_drsize, bytes->e_drsize);
+  H_PUT_32 (abfd, execp->a_tload, bytes->e_tload);
+  H_PUT_32 (abfd, execp->a_dload, bytes->e_dload);
   bytes->e_talign[0] = execp->a_talign;
   bytes->e_dalign[0] = execp->a_dalign;
@@ -113 +119 @@
   mh_com exec_bytes;
 
-  if (bfd_read ((PTR) & exec_bytes, MHCOM_BYTES_SIZE, 1, abfd)
+  if (bfd_bread ((PTR) &exec_bytes, (bfd_size_type) MHCOM_BYTES_SIZE, abfd)
       != MHCOM_BYTES_SIZE)
     {
@@ -121 +127 @@
     }
 
-  anexec.a_info = bfd_h_get_16 (abfd, exec_bytes.m_sync);
+  anexec.a_info = H_GET_16 (abfd, exec_bytes.m_sync);
   if (N_BADMAG (anexec))
     {
@@ -148 +154 @@
   unsigned long bss_start;
 
-  /* Architecture and machine type */
+  /* Architecture and machine type.  */
   bfd_set_arch_mach (abfd, bfd_arch_i386, 0);
 
@@ -155 +161 @@
   obj_sym_filepos (abfd) = 0;
 
-  /* The alignments of the sections */
+  /* The alignments of the sections.  */
   obj_textsec (abfd)->alignment_power = execp->a_talign;
   obj_datasec (abfd)->alignment_power = execp->a_dalign;
@@ -164 +170 @@
   obj_datasec (abfd)->vma = execp->a_dload;
 
-  /* And reload the sizes, since the aout module zaps them */
+  /* And reload the sizes, since the aout module zaps them.  */
   obj_textsec (abfd)->_raw_size = execp->a_text;
 
-  bss_start = execp->a_dload + execp->a_data;   /* BSS = end of data section */
+  bss_start = execp->a_dload + execp->a_data;   /* BSS = end of data section.  */
   obj_bsssec (abfd)->vma = align_power (bss_start, execp->a_balign);
 
-  /* The file positions of the sections */
+  /* The file positions of the sections.  */
   obj_textsec (abfd)->filepos = execp->a_entry;
   obj_datasec (abfd)->filepos = execp->a_dload;
@@ -176 +182 @@
   /* The file positions of the relocation info ***
   obj_textsec (abfd)->rel_filepos = N_TROFF(*execp);
-  obj_datasec (abfd)->rel_filepos =  N_DROFF(*execp);
-  */
-
-  adata (abfd).page_size = 1;   /* Not applicable. */
-  adata (abfd).segment_size = 1;/* Not applicable. */
+  obj_datasec (abfd)->rel_filepos =  N_DROFF(*execp);  */
+
+  adata (abfd).page_size = 1;   /* Not applicable.  */
+  adata (abfd).segment_size = 1;/* Not applicable.  */
   adata (abfd).exec_bytes_size = MHCOM_BYTES_SIZE;
 
@@ -193 +198 @@
 };
 
-static boolean
+static bfd_boolean
 os9k_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;
@@ -210 +216 @@
   obj_bsssec (abfd) = (asection *) NULL;
 
-  return true;
-}
-
-static boolean
+  return TRUE;
+}
+
+static bfd_boolean
 os9k_write_object_contents (abfd)
      bfd *abfd;
@@ -220 +226 @@
 
   if (! aout_32_make_sections (abfd))
-    return false;
+    return FALSE;
 
   exec_hdr (abfd)->a_info = BMAGIC;
@@ -244 +250 @@
 
   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;
-
-  /* Now write out reloc info, followed by syms and strings */
+      || bfd_bwrite ((PTR) & swapped_hdr, (bfd_size_type) EXEC_BYTES_SIZE,
+                    abfd) != EXEC_BYTES_SIZE)
+    return FALSE;
+
+  /* Now write out reloc info, followed by syms and strings.  */
   if (bfd_get_symcount (abfd) != 0)
     {
       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_TROFF (*exec_hdr (abfd))), SEEK_SET)
           != 0)
-        return false;
+        return FALSE;
 
       if (!b_out_squirt_out_relocs (abfd, obj_textsec (abfd)))
-        return false;
+        return FALSE;
       if (bfd_seek (abfd, (file_ptr) (N_DROFF (*exec_hdr (abfd))), SEEK_SET)
           != 0)
-        return false;
+        return FALSE;
 
       if (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd)))
-        return false;
-    }
-  return true;
-}
-
-
-static boolean
+        return FALSE;
+    }
+  return TRUE;
+}
+
+
+static bfd_boolean
 os9k_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
@@ -284 +290 @@
 {
 
-  if (abfd->output_has_begun == false)
+  if (! abfd->output_has_begun)
     {                           /* set by bfd.c handler */
       if (! aout_32_make_sections (abfd))
-        return false;
+        return FALSE;
 
       obj_textsec (abfd)->filepos = sizeof (struct internal_exec);
@@ -294 +300 @@
 
     }
-  /* regardless, once we know what we're doing, we might as well get going */
+  /* Regardless, once we know what we're doing, we might as well get going.  */
   if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (count != 0)
-    {
-      return (bfd_write ((PTR) location, 1, count, abfd) == count) ? true : false;
-    }
-  return true;
+    return bfd_bwrite ((PTR) location, (bfd_size_type) count, abfd) == count;
+
+  return TRUE;
 }
 #endif  /* 0 */
@@ -309 +314 @@
 os9k_sizeof_headers (ignore_abfd, ignore)
      bfd *ignore_abfd ATTRIBUTE_UNUSED;
-     boolean ignore ATTRIBUTE_UNUSED;
+     bfd_boolean ignore ATTRIBUTE_UNUSED;
 {
   return sizeof (struct internal_exec);
@@ -315 +320 @@
 
 
-/***********************************************************************/
+
 
 #define aout_32_close_and_cleanup aout_32_bfd_free_cached_info
@@ -330 +335 @@
 #define os9k_bfd_relax_section bfd_generic_relax_section
 #define os9k_bfd_gc_sections bfd_generic_gc_sections
+#define os9k_bfd_merge_sections bfd_generic_merge_sections
+#define os9k_bfd_discard_group bfd_generic_discard_group
 #define os9k_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define os9k_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
 #define os9k_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define os9k_bfd_link_just_syms _bfd_generic_link_just_syms
 #define os9k_bfd_final_link _bfd_generic_final_link
 #define os9k_bfd_link_split_section  _bfd_generic_link_split_section
 
 const bfd_target i386os9k_vec =
-{
-  "i386os9k",                   /* name */
-  bfd_target_os9k_flavour,
-  BFD_ENDIAN_LITTLE,            /* data byte order is little */
-  BFD_ENDIAN_LITTLE,            /* hdr byte order is little */
-  (HAS_RELOC | EXEC_P | WP_TEXT),       /* object flags */
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD),    /* section flags */
-  0,                            /* symbol leading char */
-  ' ',                          /* ar_pad_char */
-  16,                           /* ar_max_namelen */
-
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,   /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,   /* hdrs */
-  {_bfd_dummy_target, os9k_object_p,    /* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
-  {bfd_false, bfd_false,        /* bfd_set_format */
-   _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, bfd_false,        /* 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 (os9k),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  NULL,
-  
-  (PTR) 0,
-};
+  {
+    "i386os9k",                 /* name */
+    bfd_target_os9k_flavour,
+    BFD_ENDIAN_LITTLE,          /* data byte order is little */
+    BFD_ENDIAN_LITTLE,          /* hdr byte order is little */
+    (HAS_RELOC | EXEC_P | WP_TEXT),     /* object flags */
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD),  /* section flags */
+    0,                          /* symbol leading char */
+    ' ',                                /* ar_pad_char */
+    16,                         /* ar_max_namelen */
+
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
+    {_bfd_dummy_target, os9k_object_p,  /* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+    {bfd_false, bfd_false,      /* bfd_set_format */
+     _bfd_generic_mkarchive, bfd_false},
+    {bfd_false, bfd_false,      /* 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 (os9k),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    NULL,
+
+    (PTR) 0,
+  };