* symbols.c (fb_label_name): Allow an augend of 2 for mmix.

[deliverable/binutils-gdb.git] / bfd / i386os9k.c

diff --git a/bfd/i386os9k.c b/bfd/i386os9k.c
index 0aadee52d73d4f590ce3a49192f839cd2394a650..ec5e2795a1783f22893c24c20a465994a41f606d 100644 (file)
--- a/bfd/i386os9k.c
+++ b/bfd/i386os9k.c
@@ -1,5 +1,6 @@
 /* BFD back-end for os9000 i386 binaries.
 /* BFD back-end for os9000 i386 binaries.

-   Copyright 1990, 91, 92, 93, 94, 95, 98, 1999 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002,
+   2004 Free Software Foundation, Inc.

    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.


@@ -26,11 +27,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libaout.h"           /* BFD a.out internal data structures */
 #include "os9k.h"
 
 #include "libaout.h"           /* BFD a.out internal data structures */
 #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.  */
 
 /* 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;
      mh_com *raw_bytes;
 os9k_swap_exec_header_in (abfd, raw_bytes, execp)
      bfd *abfd;
      mh_com *raw_bytes;


@@ -40,70 +48,35 @@ os9k_swap_exec_header_in (abfd, raw_bytes, execp)
   unsigned int dload, dmemsize, dmemstart;
 
   /* Now fill in fields in the execp, from the bytes in the raw data.  */
   unsigned int dload, dmemsize, dmemstart;
 
   /* 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_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;
 
   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
   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))
          != sizeof (dmemstart))

-      || (bfd_read (&dmemsize, sizeof (dmemsize), 1, abfd)
+      || (bfd_bread (&dmemsize, (bfd_size_type) sizeof (dmemsize), abfd)

          != sizeof (dmemsize)))
          != sizeof (dmemsize)))

-    return false;
+    return FALSE;

 
   execp->a_tload = 0;
 
   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_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;
 
 
   execp->a_trsize = 0;
   execp->a_drsize = 0;
 

-  return true;
+  return TRUE;

 }
 
 }
 

-#if 0
-/* Swaps the information in an internal exec header structure into the
-   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 (abfd, execp, raw_bytes)
-     bfd *abfd;
-     struct internal_exec *execp;
-     mh_com *raw_bytes;
-{
-  mh_com *bytes = (mh_com *) raw_bytes;
-
-  /* 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);
-  bytes->e_talign[0] = execp->a_talign;
-  bytes->e_dalign[0] = execp->a_dalign;
-  bytes->e_balign[0] = execp->a_balign;
-  bytes->e_relaxable[0] = execp->a_relaxable;
-}
-
-#endif /* 0 */
-

 static const bfd_target *
 os9k_object_p (abfd)
      bfd *abfd;
 static const bfd_target *
 os9k_object_p (abfd)
      bfd *abfd;


@@ -111,7 +84,7 @@ os9k_object_p (abfd)
   struct internal_exec anexec;
   mh_com exec_bytes;
 
   struct internal_exec anexec;
   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)
     {
       if (bfd_get_error () != bfd_error_system_call)
       != MHCOM_BYTES_SIZE)
     {
       if (bfd_get_error () != bfd_error_system_call)


@@ -119,7 +92,7 @@ os9k_object_p (abfd)
       return 0;
     }
 
       return 0;
     }
 

-  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))
     {
       bfd_set_error (bfd_error_wrong_format);
   if (N_BADMAG (anexec))
     {
       bfd_set_error (bfd_error_wrong_format);


@@ -146,14 +119,14 @@ os9k_callback (abfd)
   struct internal_exec *execp = exec_hdr (abfd);
   unsigned long bss_start;
 
   struct internal_exec *execp = exec_hdr (abfd);
   unsigned long bss_start;
 

-  /* Architecture and machine type */
+  /* Architecture and machine type.  */

   bfd_set_arch_mach (abfd, bfd_arch_i386, 0);
 
   /* The positions of the string table and symbol table.  */
   obj_str_filepos (abfd) = 0;
   obj_sym_filepos (abfd) = 0;
 
   bfd_set_arch_mach (abfd, bfd_arch_i386, 0);
 
   /* The positions of the string table and symbol table.  */
   obj_str_filepos (abfd) = 0;
   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;
   obj_bsssec (abfd)->alignment_power = execp->a_balign;
   obj_textsec (abfd)->alignment_power = execp->a_talign;
   obj_datasec (abfd)->alignment_power = execp->a_dalign;
   obj_bsssec (abfd)->alignment_power = execp->a_balign;


@@ -162,157 +135,36 @@ os9k_callback (abfd)
   obj_textsec (abfd)->vma = execp->a_tload;
   obj_datasec (abfd)->vma = execp->a_dload;
 
   obj_textsec (abfd)->vma = execp->a_tload;
   obj_datasec (abfd)->vma = execp->a_dload;
 

-  /* And reload the sizes, since the aout module zaps them */
-  obj_textsec (abfd)->_raw_size = execp->a_text;
+  /* And reload the sizes, since the aout module zaps them.  */
+  obj_textsec (abfd)->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);
 
   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;
 
   /* The file positions of the relocation info ***
   obj_textsec (abfd)->rel_filepos = N_TROFF(*execp);
   obj_textsec (abfd)->filepos = execp->a_entry;
   obj_datasec (abfd)->filepos = execp->a_dload;
 
   /* The file positions of the relocation info ***
   obj_textsec (abfd)->rel_filepos = N_TROFF(*execp);

-  obj_datasec (abfd)->rel_filepos =  N_DROFF(*execp);
-  */
+  obj_datasec (abfd)->rel_filepos =  N_DROFF(*execp);  */

 
 

-  adata (abfd).page_size = 1;  /* Not applicable. */
-  adata (abfd).segment_size = 1;/* Not applicable. */
+  adata (abfd).page_size = 1;  /* Not applicable.  */
+  adata (abfd).segment_size = 1;/* Not applicable.  */

   adata (abfd).exec_bytes_size = MHCOM_BYTES_SIZE;
 
   return abfd->xvec;
 }
 
   adata (abfd).exec_bytes_size = MHCOM_BYTES_SIZE;
 
   return abfd->xvec;
 }
 

-#if 0
-struct bout_data_struct
-{
-  struct aoutdata a;
-  struct internal_exec e;
-};
-
-static boolean
-os9k_mkobject (abfd)
-     bfd *abfd;
-{
-  struct bout_data_struct *rawptr;
-
-  rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, sizeof (struct bout_data_struct));
-  if (rawptr == NULL)
-    return false;
-
-  abfd->tdata.bout_data = rawptr;
-  exec_hdr (abfd) = &rawptr->e;
-
-  obj_textsec (abfd) = (asection *) NULL;
-  obj_datasec (abfd) = (asection *) NULL;
-  obj_bsssec (abfd) = (asection *) NULL;
-
-  return true;
-}
-
-static boolean
-os9k_write_object_contents (abfd)
-     bfd *abfd;
-{
-  struct external_exec swapped_hdr;
-
-  if (! aout_32_make_sections (abfd))
-    return false;
-
-  exec_hdr (abfd)->a_info = BMAGIC;
-
-  exec_hdr (abfd)->a_text = obj_textsec (abfd)->_raw_size;
-  exec_hdr (abfd)->a_data = obj_datasec (abfd)->_raw_size;
-  exec_hdr (abfd)->a_bss = obj_bsssec (abfd)->_raw_size;
-  exec_hdr (abfd)->a_syms = bfd_get_symcount (abfd) * sizeof (struct nlist);
-  exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd);
-  exec_hdr (abfd)->a_trsize = ((obj_textsec (abfd)->reloc_count) *
-                              sizeof (struct relocation_info));
-  exec_hdr (abfd)->a_drsize = ((obj_datasec (abfd)->reloc_count) *
-                              sizeof (struct relocation_info));
-
-  exec_hdr (abfd)->a_talign = obj_textsec (abfd)->alignment_power;
-  exec_hdr (abfd)->a_dalign = obj_datasec (abfd)->alignment_power;
-  exec_hdr (abfd)->a_balign = obj_bsssec (abfd)->alignment_power;
-
-  exec_hdr (abfd)->a_tload = obj_textsec (abfd)->vma;
-  exec_hdr (abfd)->a_dload = obj_datasec (abfd)->vma;
-
-  bout_swap_exec_header_out (abfd, exec_hdr (abfd), &swapped_hdr);
-
-  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 */
-  if (bfd_get_symcount (abfd) != 0)
-    {
-      if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (*exec_hdr (abfd))), SEEK_SET)
-         != 0)
-       return false;
-
-      if (!aout_32_write_syms (abfd))
-       return false;
-
-      if (bfd_seek (abfd, (file_ptr) (N_TROFF (*exec_hdr (abfd))), SEEK_SET)
-         != 0)
-       return false;
-
-      if (!b_out_squirt_out_relocs (abfd, obj_textsec (abfd)))
-       return false;
-      if (bfd_seek (abfd, (file_ptr) (N_DROFF (*exec_hdr (abfd))), SEEK_SET)
-         != 0)
-       return false;
-
-      if (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd)))
-       return false;
-    }
-  return true;
-}
-\f
-static boolean
-os9k_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     unsigned char *location;
-     file_ptr offset;
-     int count;
-{
-
-  if (abfd->output_has_begun == false)
-    {                          /* set by bfd.c handler */
-      if (! aout_32_make_sections (abfd))
-       return false;
-
-      obj_textsec (abfd)->filepos = sizeof (struct internal_exec);
-      obj_datasec (abfd)->filepos = obj_textsec (abfd)->filepos
-       + obj_textsec (abfd)->_raw_size;
-
-    }
-  /* 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;
-
-  if (count != 0)
-    {
-      return (bfd_write ((PTR) location, 1, count, abfd) == count) ? true : false;
-    }
-  return true;
-}
-#endif /* 0 */
-

 static int
 os9k_sizeof_headers (ignore_abfd, ignore)
      bfd *ignore_abfd ATTRIBUTE_UNUSED;
 static int
 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);
 }
 
 {
   return sizeof (struct internal_exec);
 }
 

-
-/***********************************************************************/
+\f

 
 #define aout_32_close_and_cleanup aout_32_bfd_free_cached_info
 
 
 #define aout_32_close_and_cleanup aout_32_bfd_free_cached_info
 


@@ -327,47 +179,54 @@ os9k_sizeof_headers (ignore_abfd, ignore)
   bfd_generic_get_relocated_section_contents
 #define os9k_bfd_relax_section bfd_generic_relax_section
 #define os9k_bfd_gc_sections bfd_generic_gc_sections
   bfd_generic_get_relocated_section_contents
 #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_is_group_section bfd_generic_is_group_section
+#define os9k_bfd_discard_group bfd_generic_discard_group
+#define os9k_section_already_linked \
+  _bfd_generic_section_already_linked

 #define os9k_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
 #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_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 =
 #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,
+  };