This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Committed, bfd/mmo.c: Adjust to ISO C.


Uninteresting.

	* mmo.c: Adjust to ISO C.

Index: mmo.c
===================================================================
RCS file: /cvs/src/src/bfd/mmo.c,v
retrieving revision 1.23
diff -p -c -r1.23 mmo.c
*** mmo.c	24 Oct 2004 21:40:36 -0000	1.23
--- mmo.c	24 Oct 2004 22:37:26 -0000
*************** enum mmo_sym_type { mmo_reg_sym, mmo_und
*** 260,266 ****
  struct mmo_symbol
    {
      struct mmo_symbol *next;
!     const char *name;
      bfd_vma value;
      enum mmo_sym_type sym_type;
      unsigned int serno;
--- 260,266 ----
  struct mmo_symbol
    {
      struct mmo_symbol *next;
!     char *name;
      bfd_vma value;
      enum mmo_sym_type sym_type;
      unsigned int serno;
*************** struct mmo_find_sec_info
*** 355,473 ****
      bfd_vma addr;
    };

! static bfd_boolean mmo_bfd_copy_private_bfd_data
!   PARAMS ((bfd *, bfd *));
! static void mmo_write_section_unless_reg_contents
!  PARAMS ((bfd *, asection *, PTR));
! static void mmo_find_sec_w_addr
!   PARAMS ((bfd *, asection *, PTR));
! static void mmo_find_sec_w_addr_grow
!   PARAMS ((bfd *, asection *, PTR));
! static asection *mmo_make_section
!   PARAMS ((bfd *, const char *));
! static void mmo_get_symbol_info
!   PARAMS ((bfd *, asymbol *, symbol_info *));
! static void mmo_print_symbol
!   PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
! static void mmo_init
!   PARAMS ((void));
! static bfd_boolean mmo_mkobject
!   PARAMS ((bfd *));
! static bfd_boolean mmo_scan
!   PARAMS ((bfd *));
! static asection *mmo_decide_section
!   PARAMS ((bfd *, bfd_vma));
! static asection *mmo_get_generic_spec_data_section
!   PARAMS ((bfd *, int));
! static asection *mmo_get_spec_section
!   PARAMS ((bfd *, int));
! static INLINE bfd_byte *mmo_get_loc
!   PARAMS ((asection *, bfd_vma, int));
! static void mmo_xore_64
!   PARAMS ((asection *, bfd_vma vma, bfd_vma value));
! static void mmo_xore_32
!   PARAMS ((asection *, bfd_vma vma, unsigned int));
! static void mmo_xore_16
!   PARAMS ((asection *, bfd_vma vma, unsigned int));
! static const bfd_target *mmo_object_p
!   PARAMS ((bfd *));
! static void mmo_map_set_sizes
!   PARAMS ((bfd *, asection *, PTR));
! static bfd_boolean mmo_get_symbols
!   PARAMS ((bfd *));
! static bfd_boolean mmo_create_symbol
!   PARAMS ((bfd *, const char *, bfd_vma, enum mmo_sym_type, unsigned int));
! static bfd_boolean mmo_get_section_contents
!   PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
! static long mmo_get_symtab_upper_bound
!   PARAMS ((bfd *));
! static long mmo_canonicalize_symtab
!   PARAMS ((bfd *, asymbol **));
! static void mmo_get_symbol_info
!   PARAMS ((bfd *, asymbol *, symbol_info *));
! static void mmo_print_symbol
!   PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
! static bfd_boolean mmo_set_section_contents
!   PARAMS ((bfd *, sec_ptr, const PTR, file_ptr, bfd_size_type));
! static int mmo_sizeof_headers
!   PARAMS ((bfd *, bfd_boolean));
! static long mmo_get_reloc_upper_bound
!   PARAMS ((bfd *, asection *));
!
! static bfd_boolean mmo_internal_write_header
!   PARAMS ((bfd *));
! static bfd_boolean mmo_internal_write_post
!   PARAMS ((bfd *, int, asection *));
! static bfd_boolean mmo_internal_add_3_sym
!   PARAMS ((bfd *, struct mmo_symbol_trie *, const struct mmo_symbol *));
! static unsigned int mmo_internal_3_length
!   PARAMS ((bfd *, struct mmo_symbol_trie *));
! static void mmo_internal_3_dump
!   PARAMS ((bfd *, struct mmo_symbol_trie *));
! static void mmo_beb128_out
!   PARAMS ((bfd *, int, int));
! static bfd_boolean mmo_internal_write_section
!   PARAMS ((bfd *, asection *));
! static void mmo_write_tetra
!   PARAMS ((bfd *, unsigned int));
! static void mmo_write_tetra_raw
!   PARAMS ((bfd *, unsigned int));
! static void mmo_write_octa
!   PARAMS ((bfd *, bfd_vma));
! static void mmo_write_octa_raw
!   PARAMS ((bfd *, bfd_vma));
! static bfd_boolean mmo_write_chunk
!   PARAMS ((bfd *, const bfd_byte *, unsigned int));
! static bfd_boolean mmo_flush_chunk
!   PARAMS ((bfd *));
! static bfd_boolean mmo_write_loc_chunk
!   PARAMS ((bfd *, bfd_vma, const bfd_byte *, unsigned int, bfd_vma *));
! static bfd_boolean mmo_write_chunk_list
!   PARAMS ((bfd *, mmo_data_list_type *));
! static bfd_boolean mmo_write_loc_chunk_list
!   PARAMS ((bfd *, mmo_data_list_type *));
! static bfd_boolean mmo_write_symbols_and_terminator
!   PARAMS ((bfd *));
! static flagword mmo_sec_flags_from_bfd_flags
!   PARAMS ((flagword));
! static flagword bfd_sec_flags_from_mmo_flags
!   PARAMS ((flagword));
! static bfd_byte mmo_get_byte
!   PARAMS ((bfd *));
! static void mmo_write_byte
!   PARAMS ((bfd *, bfd_byte));
! static bfd_boolean mmo_new_section_hook
!   PARAMS ((bfd *, asection *));
! static int mmo_sort_mmo_symbols
!   PARAMS ((const PTR, const PTR));
! static bfd_boolean mmo_write_object_contents
!   PARAMS ((bfd *));
! static long mmo_canonicalize_reloc
!   PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
! static bfd_boolean mmo_write_section_description
!   PARAMS ((bfd *, asection *));
! static bfd_boolean mmo_has_leading_or_trailing_zero_tetra_p
!   PARAMS ((bfd *, asection *));

  /* Global "const" variables initialized once.  Must not depend on
     particular input or caller; put such things into the bfd or elsewhere.
--- 355,424 ----
      bfd_vma addr;
    };

! static bfd_boolean mmo_bfd_copy_private_bfd_data (bfd *, bfd *);
! static void mmo_write_section_unless_reg_contents (bfd *, asection *, void *);
! static void mmo_find_sec_w_addr (bfd *, asection *, void *);
! static void mmo_find_sec_w_addr_grow (bfd *, asection *, void *);
! static asection *mmo_make_section (bfd *, const char *);
! static void mmo_get_symbol_info (bfd *, asymbol *, symbol_info *);
! static void mmo_print_symbol (bfd *, void *, asymbol *,
! 			      bfd_print_symbol_type);
! static void mmo_init (void);
! static bfd_boolean mmo_mkobject (bfd *);
! static bfd_boolean mmo_scan (bfd *);
! static asection *mmo_decide_section (bfd *, bfd_vma);
! static asection *mmo_get_generic_spec_data_section (bfd *, int);
! static asection *mmo_get_spec_section (bfd *, int);
! static INLINE bfd_byte *mmo_get_loc (asection *, bfd_vma, int);
! static void mmo_xore_64 (asection *, bfd_vma vma, bfd_vma value);
! static void mmo_xore_32 (asection *, bfd_vma vma, unsigned int);
! static void mmo_xore_16 (asection *, bfd_vma vma, unsigned int);
! static const bfd_target *mmo_object_p (bfd *);
! static void mmo_map_set_sizes (bfd *, asection *, void *);
! static bfd_boolean mmo_get_symbols (bfd *);
! static bfd_boolean mmo_create_symbol (bfd *, const char *, bfd_vma,
! 				      enum mmo_sym_type, unsigned int);
! static bfd_boolean mmo_get_section_contents (bfd *, asection *, void *,
! 					     file_ptr, bfd_size_type);
! static long mmo_get_symtab_upper_bound (bfd *);
! static long mmo_canonicalize_symtab (bfd *, asymbol **);
! static void mmo_get_symbol_info (bfd *, asymbol *, symbol_info *);
! static void mmo_print_symbol (bfd *, void *, asymbol *,
! 			      bfd_print_symbol_type);
! static bfd_boolean mmo_set_section_contents (bfd *, sec_ptr, const void *,
! 					     file_ptr, bfd_size_type);
! static int mmo_sizeof_headers (bfd *, bfd_boolean);
! static long mmo_get_reloc_upper_bound (bfd *, asection *);
! static bfd_boolean mmo_internal_write_header (bfd *);
! static bfd_boolean mmo_internal_write_post (bfd *, int, asection *);
! static bfd_boolean mmo_internal_add_3_sym (bfd *, struct mmo_symbol_trie *,
! 					   const struct mmo_symbol *);
! static unsigned int mmo_internal_3_length (bfd *, struct mmo_symbol_trie *);
! static void mmo_internal_3_dump (bfd *, struct mmo_symbol_trie *);
! static void mmo_beb128_out (bfd *, int, int);
! static bfd_boolean mmo_internal_write_section (bfd *, asection *);
! static void mmo_write_tetra (bfd *, unsigned int);
! static void mmo_write_tetra_raw (bfd *, unsigned int);
! static void mmo_write_octa (bfd *, bfd_vma);
! static void mmo_write_octa_raw (bfd *, bfd_vma);
! static bfd_boolean mmo_write_chunk (bfd *, const bfd_byte *, unsigned int);
! static bfd_boolean mmo_flush_chunk (bfd *);
! static bfd_boolean mmo_write_loc_chunk (bfd *, bfd_vma, const bfd_byte *,
! 					unsigned int, bfd_vma *);
! static bfd_boolean mmo_write_chunk_list (bfd *, mmo_data_list_type *);
! static bfd_boolean mmo_write_loc_chunk_list (bfd *, mmo_data_list_type *);
! static bfd_boolean mmo_write_symbols_and_terminator (bfd *);
! static flagword mmo_sec_flags_from_bfd_flags (flagword);
! static flagword bfd_sec_flags_from_mmo_flags (flagword);
! static bfd_byte mmo_get_byte (bfd *);
! static void mmo_write_byte (bfd *, bfd_byte);
! static bfd_boolean mmo_new_section_hook (bfd *, asection *);
! static int mmo_sort_mmo_symbols (const void *, const void *);
! static bfd_boolean mmo_write_object_contents (bfd *);
! static long mmo_canonicalize_reloc (bfd *, sec_ptr, arelent **, asymbol **);
! static bfd_boolean mmo_write_section_description (bfd *, asection *);
! static bfd_boolean mmo_has_leading_or_trailing_zero_tetra_p (bfd *,
! 							     asection *);

  /* Global "const" variables initialized once.  Must not depend on
     particular input or caller; put such things into the bfd or elsewhere.
*************** char valid_mmo_symbol_character_set[/* A
*** 491,499 ****
     one, new memory for the name is allocated.  */

  static asection *
! mmo_make_section (abfd, secname)
!      bfd *abfd;
!      const char *secname;
  {
    asection *sec = bfd_get_section_by_name (abfd, secname);

--- 442,448 ----
     one, new memory for the name is allocated.  */

  static asection *
! mmo_make_section (bfd *abfd, const char *secname)
  {
    asection *sec = bfd_get_section_by_name (abfd, secname);

*************** mmo_make_section (abfd, secname)
*** 520,526 ****
     here, nor must it be static.  Add it to tdata information instead.  */

  static void
! mmo_init ()
  {
    static bfd_boolean inited = FALSE;
    int i = 0;
--- 469,475 ----
     here, nor must it be static.  Add it to tdata information instead.  */

  static void
! mmo_init (void)
  {
    static bfd_boolean inited = FALSE;
    int i = 0;
*************** mmo_init ()
*** 543,550 ****
  /* Check whether an existing file is an mmo file.  */

  static const bfd_target *
! mmo_object_p (abfd)
!      bfd *abfd;
  {
    struct stat statbuf;
    bfd_byte b[4];
--- 492,498 ----
  /* Check whether an existing file is an mmo file.  */

  static const bfd_target *
! mmo_object_p (bfd *abfd)
  {
    struct stat statbuf;
    bfd_byte b[4];
*************** mmo_object_p (abfd)
*** 611,618 ****
  /* Set up the mmo tdata information.  */

  static bfd_boolean
! mmo_mkobject (abfd)
!      bfd *abfd;
  {
    mmo_init ();

--- 559,565 ----
  /* Set up the mmo tdata information.  */

  static bfd_boolean
! mmo_mkobject (bfd *abfd)
  {
    mmo_init ();

*************** mmo_mkobject (abfd)
*** 636,644 ****
  }

  static bfd_boolean
! mmo_bfd_copy_private_bfd_data (ibfd, obfd)
!      bfd *ibfd;
!      bfd *obfd;
  {
    if (bfd_get_flavour (ibfd) != bfd_target_mmo_flavour
        || bfd_get_flavour (obfd) != bfd_target_mmo_flavour)
--- 583,589 ----
  }

  static bfd_boolean
! mmo_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
  {
    if (bfd_get_flavour (ibfd) != bfd_target_mmo_flavour
        || bfd_get_flavour (obfd) != bfd_target_mmo_flavour)
*************** mmo_bfd_copy_private_bfd_data (ibfd, obf
*** 656,665 ****
     bfd_map_over_sections.  */

  static void
! mmo_find_sec_w_addr (abfd, sec, p)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      asection *sec;
!      PTR p;
  {
    struct mmo_find_sec_info *infop = (struct mmo_find_sec_info *) p;
    bfd_vma vma = bfd_get_section_vma (abfd, sec);
--- 601,607 ----
     bfd_map_over_sections.  */

  static void
! mmo_find_sec_w_addr (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *p)
  {
    struct mmo_find_sec_info *infop = (struct mmo_find_sec_info *) p;
    bfd_vma vma = bfd_get_section_vma (abfd, sec);
*************** mmo_find_sec_w_addr (abfd, sec, p)
*** 674,683 ****
  }

  static void
! mmo_find_sec_w_addr_grow (abfd, sec, p)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      asection *sec;
!      PTR p;
  {
    struct mmo_find_sec_info *infop = (struct mmo_find_sec_info *) p;
    bfd_vma vma = bfd_get_section_vma (abfd, sec);
--- 616,622 ----
  }

  static void
! mmo_find_sec_w_addr_grow (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *p)
  {
    struct mmo_find_sec_info *infop = (struct mmo_find_sec_info *) p;
    bfd_vma vma = bfd_get_section_vma (abfd, sec);
*************** mmo_find_sec_w_addr_grow (abfd, sec, p)
*** 697,705 ****
     increasing number.  */

  static asection *
! mmo_decide_section (abfd, vma)
!      bfd *abfd;
!      bfd_vma vma;
  {
    asection *sec = NULL;
    char sec_name[sizeof (".MMIX.sec.") + 20];
--- 636,642 ----
     increasing number.  */

  static asection *
! mmo_decide_section (bfd *abfd, bfd_vma vma)
  {
    asection *sec = NULL;
    char sec_name[sizeof (".MMIX.sec.") + 20];
*************** mmo_decide_section (abfd, vma)
*** 768,777 ****
  /* Xor in a 64-bit value VALUE at VMA.  */

  static INLINE void
! mmo_xore_64 (sec, vma, value)
!      asection *sec;
!      bfd_vma vma;
!      bfd_vma value;
  {
    bfd_byte *loc = mmo_get_loc (sec, vma, 8);
    bfd_vma prev = bfd_get_64 (sec->owner, loc);
--- 705,711 ----
  /* Xor in a 64-bit value VALUE at VMA.  */

  static INLINE void
! mmo_xore_64 (asection *sec, bfd_vma vma, bfd_vma value)
  {
    bfd_byte *loc = mmo_get_loc (sec, vma, 8);
    bfd_vma prev = bfd_get_64 (sec->owner, loc);
*************** mmo_xore_64 (sec, vma, value)
*** 783,792 ****
  /* Xor in a 32-bit value VALUE at VMA.  */

  static INLINE void
! mmo_xore_32 (sec, vma, value)
!      asection *sec;
!      bfd_vma vma;
!      unsigned int value;
  {
    bfd_byte *loc = mmo_get_loc (sec, vma, 4);
    unsigned int prev = bfd_get_32 (sec->owner, loc);
--- 717,723 ----
  /* Xor in a 32-bit value VALUE at VMA.  */

  static INLINE void
! mmo_xore_32 (asection *sec, bfd_vma vma, unsigned int value)
  {
    bfd_byte *loc = mmo_get_loc (sec, vma, 4);
    unsigned int prev = bfd_get_32 (sec->owner, loc);
*************** mmo_xore_32 (sec, vma, value)
*** 798,807 ****
  /* Xor in a 16-bit value VALUE at VMA.  */

  static INLINE void
! mmo_xore_16 (sec, vma, value)
!      asection *sec;
!      bfd_vma vma;
!      unsigned int value;
  {
    bfd_byte *loc = mmo_get_loc (sec, vma, 2);
    unsigned int prev = bfd_get_16 (sec->owner, loc);
--- 729,735 ----
  /* Xor in a 16-bit value VALUE at VMA.  */

  static INLINE void
! mmo_xore_16 (asection *sec, bfd_vma vma, unsigned int value)
  {
    bfd_byte *loc = mmo_get_loc (sec, vma, 2);
    unsigned int prev = bfd_get_16 (sec->owner, loc);
*************** mmo_xore_16 (sec, vma, value)
*** 813,836 ****
  /* Write a 32-bit word to output file, no lop_quote generated.  */

  static INLINE void
! mmo_write_tetra_raw (abfd, value)
!      bfd *abfd;
!      unsigned int value;
  {
    bfd_byte buf[4];

    bfd_put_32 (abfd, value, buf);

!   if (bfd_bwrite ((PTR) buf, 4, abfd) != 4)
      abfd->tdata.mmo_data->have_error = TRUE;
  }

  /* Write a 32-bit word to output file; lop_quote if necessary.  */

  static INLINE void
! mmo_write_tetra (abfd, value)
!      bfd *abfd;
!      unsigned int value;
  {
    if (((value >> 24) & 0xff) == LOP)
      mmo_write_tetra_raw (abfd, LOP_QUOTE_NEXT);
--- 741,760 ----
  /* Write a 32-bit word to output file, no lop_quote generated.  */

  static INLINE void
! mmo_write_tetra_raw (bfd *abfd, unsigned int value)
  {
    bfd_byte buf[4];

    bfd_put_32 (abfd, value, buf);

!   if (bfd_bwrite (buf, 4, abfd) != 4)
      abfd->tdata.mmo_data->have_error = TRUE;
  }

  /* Write a 32-bit word to output file; lop_quote if necessary.  */

  static INLINE void
! mmo_write_tetra (bfd *abfd, unsigned int value)
  {
    if (((value >> 24) & 0xff) == LOP)
      mmo_write_tetra_raw (abfd, LOP_QUOTE_NEXT);
*************** mmo_write_tetra (abfd, value)
*** 841,849 ****
  /* Write a 64-bit word to output file, perhaps with lop_quoting.  */

  static INLINE void
! mmo_write_octa (abfd, value)
!      bfd *abfd;
!      bfd_vma value;
  {
    mmo_write_tetra (abfd, (unsigned int) (value >> 32));
    mmo_write_tetra (abfd, (unsigned int) value);
--- 765,771 ----
  /* Write a 64-bit word to output file, perhaps with lop_quoting.  */

  static INLINE void
! mmo_write_octa (bfd *abfd, bfd_vma value)
  {
    mmo_write_tetra (abfd, (unsigned int) (value >> 32));
    mmo_write_tetra (abfd, (unsigned int) value);
*************** mmo_write_octa (abfd, value)
*** 852,860 ****
  /* Write a 64-bit word to output file, without lop_quoting.  */

  static INLINE void
! mmo_write_octa_raw (abfd, value)
!      bfd *abfd;
!      bfd_vma value;
  {
    mmo_write_tetra_raw (abfd, (unsigned int) (value >> 32));
    mmo_write_tetra_raw (abfd, (unsigned int) value);
--- 774,780 ----
  /* Write a 64-bit word to output file, without lop_quoting.  */

  static INLINE void
! mmo_write_octa_raw (bfd *abfd, bfd_vma value)
  {
    mmo_write_tetra_raw (abfd, (unsigned int) (value >> 32));
    mmo_write_tetra_raw (abfd, (unsigned int) value);
*************** mmo_write_octa_raw (abfd, value)
*** 864,873 ****
     sequence, followed by a call to mmo_flush_chunk.  */

  static INLINE bfd_boolean
! mmo_write_chunk (abfd, loc, len)
!      bfd *abfd;
!      const bfd_byte *loc;
!      unsigned int len;
  {
    bfd_boolean retval = TRUE;

--- 784,790 ----
     sequence, followed by a call to mmo_flush_chunk.  */

  static INLINE bfd_boolean
! mmo_write_chunk (bfd *abfd, const bfd_byte *loc, unsigned int len)
  {
    bfd_boolean retval = TRUE;

*************** mmo_write_chunk (abfd, loc, len)
*** 895,901 ****

        retval = (retval
  		&& ! abfd->tdata.mmo_data->have_error
! 		&& 4 == bfd_bwrite ((PTR) loc, 4, abfd));

        loc += 4;
        len -= 4;
--- 812,818 ----

        retval = (retval
  		&& ! abfd->tdata.mmo_data->have_error
! 		&& 4 == bfd_bwrite (loc, 4, abfd));

        loc += 4;
        len -= 4;
*************** mmo_write_chunk (abfd, loc, len)
*** 916,923 ****
     4 bytes.  */

  static INLINE bfd_boolean
! mmo_flush_chunk (abfd)
!      bfd *abfd;
  {
    if (abfd->tdata.mmo_data->byte_no != 0)
      {
--- 833,839 ----
     4 bytes.  */

  static INLINE bfd_boolean
! mmo_flush_chunk (bfd *abfd)
  {
    if (abfd->tdata.mmo_data->byte_no != 0)
      {
*************** mmo_flush_chunk (abfd)
*** 934,942 ****
  /* Same, but from a list.  */

  static INLINE bfd_boolean
! mmo_write_chunk_list (abfd, datap)
!      bfd *abfd;
!      mmo_data_list_type *datap;
  {
    for (; datap != NULL; datap = datap->next)
      if (! mmo_write_chunk (abfd, datap->data, datap->size))
--- 850,856 ----
  /* Same, but from a list.  */

  static INLINE bfd_boolean
! mmo_write_chunk_list (bfd *abfd, mmo_data_list_type *datap)
  {
    for (; datap != NULL; datap = datap->next)
      if (! mmo_write_chunk (abfd, datap->data, datap->size))
*************** mmo_write_chunk_list (abfd, datap)
*** 950,961 ****
     output if different than *LAST_VMAP, which is updated after this call.  */

  static bfd_boolean
! mmo_write_loc_chunk (abfd, vma, loc, len, last_vmap)
!      bfd *abfd;
!      bfd_vma vma;
!      const bfd_byte *loc;
!      unsigned int len;
!      bfd_vma *last_vmap;
  {
    /* Find an initial and trailing section of zero tetras; we don't need to
       write out zeros.  FIXME: When we do this, we should emit section size
--- 864,871 ----
     output if different than *LAST_VMAP, which is updated after this call.  */

  static bfd_boolean
! mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc,
! 		     unsigned int len, bfd_vma *last_vmap)
  {
    /* Find an initial and trailing section of zero tetras; we don't need to
       write out zeros.  FIXME: When we do this, we should emit section size
*************** mmo_write_loc_chunk (abfd, vma, loc, len
*** 1001,1009 ****
  /* Same, but from a list.  */

  static INLINE bfd_boolean
! mmo_write_loc_chunk_list (abfd, datap)
!      bfd *abfd;
!      mmo_data_list_type *datap;
  {
    /* Get an address different than the address of the first chunk.  */
    bfd_vma last_vma = datap ? datap->where - 1 : 0;
--- 911,917 ----
  /* Same, but from a list.  */

  static INLINE bfd_boolean
! mmo_write_loc_chunk_list (bfd *abfd, mmo_data_list_type *datap)
  {
    /* Get an address different than the address of the first chunk.  */
    bfd_vma last_vma = datap ? datap->where - 1 : 0;
*************** mmo_write_loc_chunk_list (abfd, datap)
*** 1019,1027 ****
  /* Make a .MMIX.spec_data.N section.  */

  static asection *
! mmo_get_generic_spec_data_section (abfd, spec_data_number)
!      bfd *abfd;
!      int spec_data_number;
  {
    asection *sec;
    char secname[sizeof (MMIX_OTHER_SPEC_SECTION_PREFIX) + 20]
--- 927,933 ----
  /* Make a .MMIX.spec_data.N section.  */

  static asection *
! mmo_get_generic_spec_data_section (bfd *abfd, int spec_data_number)
  {
    asection *sec;
    char secname[sizeof (MMIX_OTHER_SPEC_SECTION_PREFIX) + 20]
*************** mmo_get_generic_spec_data_section (abfd,
*** 1039,1047 ****
     ourselves, parse some of its data to get at the section name.  */

  static asection *
! mmo_get_spec_section (abfd, spec_data_number)
!      bfd *abfd;
!      int spec_data_number;
  {
    bfd_byte *secname;
    asection *sec;
--- 945,951 ----
     ourselves, parse some of its data to get at the section name.  */

  static asection *
! mmo_get_spec_section (bfd *abfd, int spec_data_number)
  {
    bfd_byte *secname;
    asection *sec;
*************** mmo_get_spec_section (abfd, spec_data_nu
*** 1204,1211 ****
  /* Read a byte, but read from file in multiples of 32-bit words.  */

  static bfd_byte
! mmo_get_byte (abfd)
!      bfd *abfd;
  {
    bfd_byte retval;

--- 1108,1114 ----
  /* Read a byte, but read from file in multiples of 32-bit words.  */

  static bfd_byte
! mmo_get_byte (bfd *abfd)
  {
    bfd_byte retval;

*************** mmo_get_byte (abfd)
*** 1231,1239 ****
  /* Write a byte, in multiples of 32-bit words.  */

  static void
! mmo_write_byte (abfd, value)
!      bfd *abfd;
!      bfd_byte value;
  {
    abfd->tdata.mmo_data->buf[(abfd->tdata.mmo_data->byte_no++ % 4)] = value;
    if ((abfd->tdata.mmo_data->byte_no % 4) == 0)
--- 1134,1140 ----
  /* Write a byte, in multiples of 32-bit words.  */

  static void
! mmo_write_byte (bfd *abfd, bfd_byte value)
  {
    abfd->tdata.mmo_data->buf[(abfd->tdata.mmo_data->byte_no++ % 4)] = value;
    if ((abfd->tdata.mmo_data->byte_no % 4) == 0)
*************** mmo_write_byte (abfd, value)
*** 1247,1258 ****
  /* Create a symbol.  */

  static bfd_boolean
! mmo_create_symbol (abfd, symname, addr, sym_type, serno)
!      bfd *abfd;
!      const char *symname;
!      bfd_vma addr;
!      enum mmo_sym_type sym_type;
!      unsigned int serno;
  {
    struct mmo_symbol *n;

--- 1148,1155 ----
  /* Create a symbol.  */

  static bfd_boolean
! mmo_create_symbol (bfd *abfd, const char *symname, bfd_vma addr, enum
! 		   mmo_sym_type sym_type, unsigned int serno)
  {
    struct mmo_symbol *n;

*************** mmo_create_symbol (abfd, symname, addr,
*** 1264,1270 ****
    if (n->name == NULL)
      return FALSE;

!   strcpy ((PTR) n->name, symname);

    n->value = addr;
    n->sym_type = sym_type;
--- 1161,1167 ----
    if (n->name == NULL)
      return FALSE;

!   strcpy (n->name, symname);

    n->value = addr;
    n->sym_type = sym_type;
*************** mmo_create_symbol (abfd, symname, addr,
*** 1299,1306 ****
  /* Read in symbols.  */

  static bfd_boolean
! mmo_get_symbols (abfd)
!      bfd *abfd;
  {
  /*
  INODE
--- 1196,1202 ----
  /* Read in symbols.  */

  static bfd_boolean
! mmo_get_symbols (bfd *abfd)
  {
  /*
  INODE
*************** SUBSECTION
*** 1433,1440 ****
  		[abfd->tdata.mmo_data->symbol_position] = 0;

  	      (*_bfd_error_handler)
! 		(_("%s: unsupported wide character sequence\
!  0x%02X 0x%02X after symbol name starting with `%s'\n"),
  		 bfd_get_filename (abfd), c, c2,
  		 abfd->tdata.mmo_data->lop_stab_symbol);
  	      bfd_set_error (bfd_error_bad_value);
--- 1329,1336 ----
  		[abfd->tdata.mmo_data->symbol_position] = 0;

  	      (*_bfd_error_handler)
! 		(_("%s: unsupported wide character sequence"
! 		   " 0x%02X 0x%02X after symbol name starting with `%s'\n"),
  		 bfd_get_filename (abfd), c, c2,
  		 abfd->tdata.mmo_data->lop_stab_symbol);
  	      bfd_set_error (bfd_error_bad_value);
*************** SUBSECTION
*** 1516,1525 ****
     MMO_SEC_CONTENTS_CHUNK_SIZE.  */

  static INLINE bfd_byte *
! mmo_get_loc (sec, vma, size)
!      asection *sec;
!      bfd_vma vma;
!      int size;
  {
    bfd_size_type allocated_size;
    struct mmo_section_data_struct *sdatap = mmo_section_data (sec);
--- 1412,1418 ----
     MMO_SEC_CONTENTS_CHUNK_SIZE.  */

  static INLINE bfd_byte *
! mmo_get_loc (asection *sec, bfd_vma vma, int size)
  {
    bfd_size_type allocated_size;
    struct mmo_section_data_struct *sdatap = mmo_section_data (sec);
*************** mmo_get_loc (sec, vma, size)
*** 1619,1628 ****
  /* Set sizes once we've read in all sections.  */

  static void
! mmo_map_set_sizes (abfd, sec, ignored)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      asection *sec;
!      PTR ignored ATTRIBUTE_UNUSED;
  {
    sec->lma = sec->vma;
  }
--- 1512,1519 ----
  /* Set sizes once we've read in all sections.  */

  static void
! mmo_map_set_sizes (bfd *abfd ATTRIBUTE_UNUSED, asection *sec,
! 		   void *ignored ATTRIBUTE_UNUSED)
  {
    sec->lma = sec->vma;
  }
*************** mmo_map_set_sizes (abfd, sec, ignored)
*** 1630,1637 ****
  /* Read the mmo file and turn it into sections.  */

  static bfd_boolean
! mmo_scan (abfd)
!      bfd *abfd;
  {
    unsigned int i;
    unsigned int lineno = 1;
--- 1521,1527 ----
  /* Read the mmo file and turn it into sections.  */

  static bfd_boolean
! mmo_scan (bfd *abfd)
  {
    unsigned int i;
    unsigned int lineno = 1;
*************** mmo_scan (abfd)
*** 1879,1886 ****
  		  if (file_names[y] != NULL)
  		    {
  		      (*_bfd_error_handler)
! 			(_("%s: invalid mmo file: file number %d `%s',\
!  was already entered as `%s'\n"),
  			 bfd_get_filename (abfd), y, fname, file_names[y]);
  		      bfd_set_error (bfd_error_bad_value);
  		      goto error_return;
--- 1769,1776 ----
  		  if (file_names[y] != NULL)
  		    {
  		      (*_bfd_error_handler)
! 			(_("%s: invalid mmo file: file number %d `%s',"
! 			   " was already entered as `%s'\n"),
  			 bfd_get_filename (abfd), y, fname, file_names[y]);
  		      bfd_set_error (bfd_error_bad_value);
  		      goto error_return;
*************** mmo_scan (abfd)
*** 1892,1899 ****
  	      if (file_names[y] == NULL)
  		{
  		  (*_bfd_error_handler)
! 		    (_("%s: invalid mmo file: file name for number %d\
!  was not specified before use\n"),
  		     bfd_get_filename (abfd), y);
  		  bfd_set_error (bfd_error_bad_value);
  		  goto error_return;
--- 1782,1789 ----
  	      if (file_names[y] == NULL)
  		{
  		  (*_bfd_error_handler)
! 		    (_("%s: invalid mmo file: file name for number %d"
! 		       " was not specified before use\n"),
  		     bfd_get_filename (abfd), y);
  		  bfd_set_error (bfd_error_bad_value);
  		  goto error_return;
*************** mmo_scan (abfd)
*** 1998,2005 ****
  	      if (y != 0 || z != 0)
  		{
  		  (*_bfd_error_handler)
! 		    (_("%s: invalid mmo file: fields y and z of lop_stab\
!  non-zero, y: %d, z: %d\n"),
  		     bfd_get_filename (abfd), y, z);
  		  bfd_set_error (bfd_error_bad_value);
  		  goto error_return;
--- 1888,1895 ----
  	      if (y != 0 || z != 0)
  		{
  		  (*_bfd_error_handler)
! 		    (_("%s: invalid mmo file: fields y and z of lop_stab"
! 		       " non-zero, y: %d, z: %d\n"),
  		     bfd_get_filename (abfd), y, z);
  		  bfd_set_error (bfd_error_bad_value);
  		  goto error_return;
*************** mmo_scan (abfd)
*** 2034,2041 ****
  		if (statbuf.st_size != curpos)
  		  {
  		    (*_bfd_error_handler)
! 		      (_("%s: invalid mmo file: lop_end not last item in\
!  file\n"),
  		       bfd_get_filename (abfd));
  		    bfd_set_error (bfd_error_bad_value);
  		    goto error_return;
--- 1924,1931 ----
  		if (statbuf.st_size != curpos)
  		  {
  		    (*_bfd_error_handler)
! 		      (_("%s: invalid mmo file: lop_end not last item in"
! 			 " file\n"),
  		       bfd_get_filename (abfd));
  		    bfd_set_error (bfd_error_bad_value);
  		    goto error_return;
*************** mmo_scan (abfd)
*** 2047,2054 ****
  		if ((long) (y * 256 + z) * 4 != (curpos - stab_loc) - 4)
  		  {
  		    (*_bfd_error_handler)
! 		      (_("%s: invalid mmo file: YZ of lop_end (%ld)\
!  not equal to the number of tetras to the preceding lop_stab (%ld)\n"),
  		       bfd_get_filename (abfd), (long) (y * 256 + z),
  		       (curpos - stab_loc - 4)/4);
  		    bfd_set_error (bfd_error_bad_value);
--- 1937,1945 ----
  		if ((long) (y * 256 + z) * 4 != (curpos - stab_loc) - 4)
  		  {
  		    (*_bfd_error_handler)
! 		      (_("%s: invalid mmo file: YZ of lop_end (%ld)"
! 			 " not equal to the number of tetras to the preceding"
! 			 " lop_stab (%ld)\n"),
  		       bfd_get_filename (abfd), (long) (y * 256 + z),
  		       (curpos - stab_loc - 4)/4);
  		    bfd_set_error (bfd_error_bad_value);
*************** mmo_scan (abfd)
*** 2115,2128 ****
     we point out the shape of allocated section contents.  */

  static bfd_boolean
! mmo_new_section_hook (abfd, newsect)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      asection *newsect;
  {
    /* We zero-fill all fields and assume NULL is represented by an all
       zero-bit pattern.  */
    newsect->used_by_bfd =
!     (PTR) bfd_zalloc (abfd, sizeof (struct mmo_section_data_struct));

    if (!newsect->used_by_bfd)
      return FALSE;
--- 2006,2017 ----
     we point out the shape of allocated section contents.  */

  static bfd_boolean
! mmo_new_section_hook (bfd *abfd ATTRIBUTE_UNUSED, asection *newsect)
  {
    /* We zero-fill all fields and assume NULL is represented by an all
       zero-bit pattern.  */
    newsect->used_by_bfd =
!     bfd_zalloc (abfd, sizeof (struct mmo_section_data_struct));

    if (!newsect->used_by_bfd)
      return FALSE;
*************** mmo_new_section_hook (abfd, newsect)
*** 2136,2147 ****
     contents.  */

  static bfd_boolean
! mmo_get_section_contents (abfd, sec, location, offset, bytes_to_do)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      asection *sec ATTRIBUTE_UNUSED;
!      PTR location ATTRIBUTE_UNUSED;
!      file_ptr offset ATTRIBUTE_UNUSED;
!      bfd_size_type bytes_to_do ATTRIBUTE_UNUSED;
  {
    /* Iterate over diminishing chunk sizes, copying contents, like
       mmo_set_section_contents.  */
--- 2025,2035 ----
     contents.  */

  static bfd_boolean
! mmo_get_section_contents (bfd *abfd ATTRIBUTE_UNUSED,
! 			  asection *sec,
! 			  void * location,
! 			  file_ptr offset,
! 			  bfd_size_type bytes_to_do)
  {
    /* Iterate over diminishing chunk sizes, copying contents, like
       mmo_set_section_contents.  */
*************** mmo_get_section_contents (abfd, sec, loc
*** 2173,2180 ****
  /* Return the amount of memory needed to read the symbol table.  */

  static long
! mmo_get_symtab_upper_bound (abfd)
!      bfd *abfd ATTRIBUTE_UNUSED;
  {
    return (abfd->symcount + 1) * sizeof (asymbol *);
  }
--- 2061,2067 ----
  /* Return the amount of memory needed to read the symbol table.  */

  static long
! mmo_get_symtab_upper_bound (bfd *abfd)
  {
    return (abfd->symcount + 1) * sizeof (asymbol *);
  }
*************** mmo_get_symtab_upper_bound (abfd)
*** 2182,2190 ****
  /* Sort mmo symbols by serial number.  */

  static int
! mmo_sort_mmo_symbols (arg1, arg2)
!      const PTR arg1;
!      const PTR arg2;
  {
    const struct mmo_symbol *sym1 = *(const struct mmo_symbol **) arg1;
    const struct mmo_symbol *sym2 = *(const struct mmo_symbol **) arg2;
--- 2069,2075 ----
  /* Sort mmo symbols by serial number.  */

  static int
! mmo_sort_mmo_symbols (const void *arg1, const void *arg2)
  {
    const struct mmo_symbol *sym1 = *(const struct mmo_symbol **) arg1;
    const struct mmo_symbol *sym2 = *(const struct mmo_symbol **) arg2;
*************** mmo_sort_mmo_symbols (arg1, arg2)
*** 2202,2210 ****
  /* Translate the symbol table.  */

  static long
! mmo_canonicalize_symtab (abfd, alocation)
!      bfd *abfd;
!      asymbol **alocation;
  {
    unsigned int symcount = bfd_get_symcount (abfd);
    asymbol *csymbols;
--- 2087,2093 ----
  /* Translate the symbol table.  */

  static long
! mmo_canonicalize_symtab (bfd *abfd, asymbol **alocation)
  {
    unsigned int symcount = bfd_get_symcount (abfd);
    asymbol *csymbols;
*************** mmo_canonicalize_symtab (abfd, alocation
*** 2313,2332 ****
  /* Get information about a symbol.  */

  static void
! mmo_get_symbol_info (ignore_abfd, symbol, ret)
!      bfd *ignore_abfd ATTRIBUTE_UNUSED;
!      asymbol *symbol;
!      symbol_info *ret;
  {
    bfd_symbol_info (symbol, ret);
  }

  static void
! mmo_print_symbol (abfd, afile, symbol, how)
!      bfd *abfd;
!      PTR afile;
!      asymbol *symbol;
!      bfd_print_symbol_type how;
  {
    FILE *file = (FILE *) afile;

--- 2196,2210 ----
  /* Get information about a symbol.  */

  static void
! mmo_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
! 		     asymbol *symbol, symbol_info *ret)
  {
    bfd_symbol_info (symbol, ret);
  }

  static void
! mmo_print_symbol (bfd *abfd, void *afile, asymbol *symbol,
! 		  bfd_print_symbol_type how)
  {
    FILE *file = (FILE *) afile;

*************** mmo_print_symbol (abfd, afile, symbol, h
*** 2336,2342 ****
        fprintf (file, "%s", symbol->name);
        break;
      default:
!       bfd_print_symbol_vandf (abfd, (PTR) file, symbol);

        fprintf (file, " %-5s %s",
  	       symbol->section->name,
--- 2214,2220 ----
        fprintf (file, "%s", symbol->name);
        break;
      default:
!       bfd_print_symbol_vandf (abfd, file, symbol);

        fprintf (file, " %-5s %s",
  	       symbol->section->name,
*************** mmo_print_symbol (abfd, afile, symbol, h
*** 2348,2356 ****
     size of header information is irrelevant.  */

  static int
! mmo_sizeof_headers (abfd, exec)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      bfd_boolean exec ATTRIBUTE_UNUSED;
  {
    return 0;
  }
--- 2226,2233 ----
     size of header information is irrelevant.  */

  static int
! mmo_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
! 		    bfd_boolean exec ATTRIBUTE_UNUSED)
  {
    return 0;
  }
*************** mmo_sizeof_headers (abfd, exec)
*** 2358,2365 ****
  /* Write the (section-neutral) file preamble.  */

  static bfd_boolean
! mmo_internal_write_header (abfd)
!      bfd *abfd;
  {
    const char lop_pre_bfd[] = { LOP, LOP_PRE, 1, 1};

--- 2235,2241 ----
  /* Write the (section-neutral) file preamble.  */

  static bfd_boolean
! mmo_internal_write_header (bfd *abfd)
  {
    const char lop_pre_bfd[] = { LOP, LOP_PRE, 1, 1};

*************** mmo_internal_write_header (abfd)
*** 2379,2388 ****
     start-address.  */

  static bfd_boolean
! mmo_internal_write_post (abfd, z, sec)
!      bfd *abfd;
!      int z;
!      asection *sec;
  {
    int i;
    bfd_byte buf[8];
--- 2255,2261 ----
     start-address.  */

  static bfd_boolean
! mmo_internal_write_post (bfd *abfd, int z, asection *sec)
  {
    int i;
    bfd_byte buf[8];
*************** mmo_internal_write_post (abfd, z, sec)
*** 2408,2415 ****
     get bitten by BFD flag number changes.  */

  static flagword
! mmo_sec_flags_from_bfd_flags (flags)
!      flagword flags;
  {
    flagword oflags = 0;

--- 2281,2287 ----
     get bitten by BFD flag number changes.  */

  static flagword
! mmo_sec_flags_from_bfd_flags (flagword flags)
  {
    flagword oflags = 0;

*************** mmo_sec_flags_from_bfd_flags (flags)
*** 2436,2443 ****
  }

  static flagword
! bfd_sec_flags_from_mmo_flags (flags)
!      flagword flags;
  {
    flagword oflags = 0;

--- 2308,2314 ----
  }

  static flagword
! bfd_sec_flags_from_mmo_flags (flagword flags)
  {
    flagword oflags = 0;

*************** bfd_sec_flags_from_mmo_flags (flags)
*** 2467,2475 ****
     is 0.  */

  static bfd_boolean
! mmo_has_leading_or_trailing_zero_tetra_p (abfd, sec)
!      bfd *abfd;
!      asection *sec;
  {
    bfd_vma secaddr = bfd_get_section_vma (abfd, sec);

--- 2338,2344 ----
     is 0.  */

  static bfd_boolean
! mmo_has_leading_or_trailing_zero_tetra_p (bfd *abfd, asection *sec)
  {
    bfd_vma secaddr = bfd_get_section_vma (abfd, sec);

*************** mmo_has_leading_or_trailing_zero_tetra_p
*** 2487,2495 ****
  /* Write a section.  */

  static bfd_boolean
! mmo_internal_write_section (abfd, sec)
!      bfd *abfd;
!      asection *sec;
  {
    /* We do it differently depending on what section this is:

--- 2356,2362 ----
  /* Write a section.  */

  static bfd_boolean
! mmo_internal_write_section (bfd *abfd, asection *sec)
  {
    /* We do it differently depending on what section this is:

*************** mmo_internal_write_section (abfd, sec)
*** 2583,2591 ****
  /* Write the description of a section, extended-mmo-style.  */

  static bfd_boolean
! mmo_write_section_description (abfd, sec)
!      bfd *abfd;
!      asection *sec;
  {
    /* Keep the following document-comment formatted the way it is.  */
  /*
--- 2450,2456 ----
  /* Write the description of a section, extended-mmo-style.  */

  static bfd_boolean
! mmo_write_section_description (bfd *abfd, asection *sec)
  {
    /* Keep the following document-comment formatted the way it is.  */
  /*
*************** EXAMPLE
*** 2699,2710 ****
  /* We save up all data before output.  */

  static bfd_boolean
! mmo_set_section_contents (abfd, sec, location, offset, bytes_to_do)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      sec_ptr sec;
!      const PTR location;
!      file_ptr offset;
!      bfd_size_type bytes_to_do;
  {
    /* Iterate over diminishing chunk sizes, copying contents.  */
    while (bytes_to_do)
--- 2564,2572 ----
  /* We save up all data before output.  */

  static bfd_boolean
! mmo_set_section_contents (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec,
! 			  const void *location, file_ptr offset,
! 			  bfd_size_type bytes_to_do)
  {
    /* Iterate over diminishing chunk sizes, copying contents.  */
    while (bytes_to_do)
*************** mmo_set_section_contents (abfd, sec, loc
*** 2735,2744 ****
  /* Add a symbol to a trie-tree.  */

  static bfd_boolean
! mmo_internal_add_3_sym (abfd, rootp, symp)
!      bfd *abfd;
!      struct mmo_symbol_trie *rootp;
!      const struct mmo_symbol *symp;
  {
    const char *name = symp->name;
    struct mmo_symbol_trie *trie = rootp;
--- 2597,2604 ----
  /* Add a symbol to a trie-tree.  */

  static bfd_boolean
! mmo_internal_add_3_sym (bfd *abfd, struct mmo_symbol_trie *rootp,
! 			const struct mmo_symbol *symp)
  {
    const char *name = symp->name;
    struct mmo_symbol_trie *trie = rootp;
*************** mmo_internal_add_3_sym (abfd, rootp, sym
*** 2797,2805 ****
  /* Find out the length of the serialized version of a trie in bytes.  */

  static unsigned int
! mmo_internal_3_length (abfd, trie)
!      bfd *abfd;
!      struct mmo_symbol_trie *trie;
  {
    /* First, one for the control byte.  */
    unsigned int length = 1;
--- 2657,2663 ----
  /* Find out the length of the serialized version of a trie in bytes.  */

  static unsigned int
! mmo_internal_3_length (bfd *abfd, struct mmo_symbol_trie *trie)
  {
    /* First, one for the control byte.  */
    unsigned int length = 1;
*************** mmo_internal_3_length (abfd, trie)
*** 2859,2868 ****
     beb128.  Using a helper function and recursion simplifies debugging.  */

  static void
! mmo_beb128_out (abfd, serno, marker)
!      bfd *abfd;
!      int serno;
!      int marker;
  {
    if (serno & ~0x7f)
      mmo_beb128_out (abfd, serno >> 7, 0);
--- 2717,2723 ----
     beb128.  Using a helper function and recursion simplifies debugging.  */

  static void
! mmo_beb128_out (bfd *abfd, int serno, int marker)
  {
    if (serno & ~0x7f)
      mmo_beb128_out (abfd, serno >> 7, 0);
*************** mmo_beb128_out (abfd, serno, marker)
*** 2872,2880 ****
  /* Serialize a trie.  */

  static void
! mmo_internal_3_dump (abfd, trie)
!      bfd *abfd;
!      struct mmo_symbol_trie *trie;
  {
    bfd_byte control = 0;

--- 2727,2733 ----
  /* Serialize a trie.  */

  static void
! mmo_internal_3_dump (bfd *abfd, struct mmo_symbol_trie *trie)
  {
    bfd_byte control = 0;

*************** mmo_internal_3_dump (abfd, trie)
*** 2967,2974 ****
  /* Write symbols in mmo format.  Also write the lop_end terminator.  */

  static bfd_boolean
! mmo_write_symbols_and_terminator (abfd)
!      bfd *abfd;
  {
    int count = bfd_get_symcount (abfd);
    asymbol *maintable[2];
--- 2820,2826 ----
  /* Write symbols in mmo format.  Also write the lop_end terminator.  */

  static bfd_boolean
! mmo_write_symbols_and_terminator (bfd *abfd)
  {
    int count = bfd_get_symcount (abfd);
    asymbol *maintable[2];
*************** mmo_write_symbols_and_terminator (abfd)
*** 3035,3042 ****
  	    sprintf_vma (vmas_start, vma_start);

  	    (*_bfd_error_handler)
! 	      (_("%s: Bad symbol definition: `Main' set to %s rather\
!  than the start address %s\n"),
  	       bfd_get_filename (abfd), vmas_main, vmas_start);
  	    bfd_set_error (bfd_error_bad_value);
  	    return FALSE;
--- 2887,2894 ----
  	    sprintf_vma (vmas_start, vma_start);

  	    (*_bfd_error_handler)
! 	      (_("%s: Bad symbol definition: `Main' set to %s rather"
! 		 " than the start address %s\n"),
  	       bfd_get_filename (abfd), vmas_main, vmas_start);
  	    bfd_set_error (bfd_error_bad_value);
  	    return FALSE;
*************** mmo_write_symbols_and_terminator (abfd)
*** 3068,3074 ****
  	  struct mmo_symbol sym;
  	  memset (&sym, 0, sizeof (sym));

! 	  sym.name = s->name;
  	  sym.value =
  	    s->value
  	    + s->section->output_section->vma
--- 2920,2928 ----
  	  struct mmo_symbol sym;
  	  memset (&sym, 0, sizeof (sym));

! 	  /* Need to strip const here; strdup:ing would leak and the
! 	     existing string must be safe to reuse.  */
! 	  sym.name = (char *) s->name;
  	  sym.value =
  	    s->value
  	    + s->section->output_section->vma
*************** mmo_write_symbols_and_terminator (abfd)
*** 3125,3132 ****
        struct mmo_symbol sym;

        (*_bfd_error_handler)
! 	(_("%s: warning: symbol table too large for mmo, larger than 65535\
!  32-bit words: %d.  Only `Main' will be emitted.\n"),
  	 bfd_get_filename (abfd), trie_len);

        memset (&sym, 0, sizeof (sym));
--- 2979,2986 ----
        struct mmo_symbol sym;

        (*_bfd_error_handler)
! 	(_("%s: warning: symbol table too large for mmo, larger than 65535"
! 	   " 32-bit words: %d.  Only `Main' will be emitted.\n"),
  	 bfd_get_filename (abfd), trie_len);

        memset (&sym, 0, sizeof (sym));
*************** mmo_write_symbols_and_terminator (abfd)
*** 3170,3177 ****
  	 isn't debugged and abort if we get here.  Instead emit a
  	 diagnostic and fail "normally".  */
        (*_bfd_error_handler)
! 	(_("%s: internal error, symbol table changed size from %d to %d\
!  words\n"),
  	 bfd_get_filename (abfd), trie_len,
  	 (abfd->tdata.mmo_data->byte_no + 3)/4);
        bfd_set_error (bfd_error_bad_value);
--- 3024,3031 ----
  	 isn't debugged and abort if we get here.  Instead emit a
  	 diagnostic and fail "normally".  */
        (*_bfd_error_handler)
! 	(_("%s: internal error, symbol table changed size from %d to %d"
! 	   " words\n"),
  	 bfd_get_filename (abfd), trie_len,
  	 (abfd->tdata.mmo_data->byte_no + 3)/4);
        bfd_set_error (bfd_error_bad_value);
*************** mmo_write_symbols_and_terminator (abfd)
*** 3200,3209 ****
     used through bfd_map_over_sections.  */

  static void
! mmo_write_section_unless_reg_contents (abfd, sec, p)
!      bfd *abfd;
!      asection *sec;
!      PTR p;
  {
    struct mmo_write_sec_info *infop = (struct mmo_write_sec_info *) p;

--- 3054,3060 ----
     used through bfd_map_over_sections.  */

  static void
! mmo_write_section_unless_reg_contents (bfd *abfd, asection *sec, void *p)
  {
    struct mmo_write_sec_info *infop = (struct mmo_write_sec_info *) p;

*************** mmo_write_section_unless_reg_contents (a
*** 3225,3232 ****
  	     make it carry contents, so we don't have a test-case for
  	     this.  */
  	  (*_bfd_error_handler)
! 	    (_("%s: internal error, internal register section %s had\
!  contents\n"),
  	     bfd_get_filename (abfd), sec->name);
  	  bfd_set_error (bfd_error_bad_value);
  	  infop->retval = FALSE;
--- 3076,3083 ----
  	     make it carry contents, so we don't have a test-case for
  	     this.  */
  	  (*_bfd_error_handler)
! 	    (_("%s: internal error, internal register section %s had"
! 	       " contents\n"),
  	     bfd_get_filename (abfd), sec->name);
  	  bfd_set_error (bfd_error_bad_value);
  	  infop->retval = FALSE;
*************** mmo_write_section_unless_reg_contents (a
*** 3243,3250 ****
     already called. */

  static bfd_boolean
! mmo_write_object_contents (abfd)
!      bfd *abfd;
  {
    struct mmo_write_sec_info wsecinfo;

--- 3094,3100 ----
     already called. */

  static bfd_boolean
! mmo_write_object_contents (bfd *abfd)
  {
    struct mmo_write_sec_info wsecinfo;

*************** mmo_write_object_contents (abfd)
*** 3256,3262 ****
    wsecinfo.retval = TRUE;

    bfd_map_over_sections (abfd, mmo_write_section_unless_reg_contents,
! 			 (PTR) &wsecinfo);

    if (! wsecinfo.retval)
      return FALSE;
--- 3106,3112 ----
    wsecinfo.retval = TRUE;

    bfd_map_over_sections (abfd, mmo_write_section_unless_reg_contents,
! 			 &wsecinfo);

    if (! wsecinfo.retval)
      return FALSE;
*************** mmo_write_object_contents (abfd)
*** 3288,3295 ****
  	       (long) sec->size);
  	  else
  	    (*_bfd_error_handler)
! 	      (_("%s: invalid start address for initialized registers of\
!  length %ld: 0x%lx%08lx\n"),
  	       bfd_get_filename (abfd),
  	       (long) sec->size,
  	       (unsigned long) (sec->vma >> 32), (unsigned long) (sec->vma));
--- 3138,3145 ----
  	       (long) sec->size);
  	  else
  	    (*_bfd_error_handler)
! 	      (_("%s: invalid start address for initialized registers of"
! 		 " length %ld: 0x%lx%08lx\n"),
  	       bfd_get_filename (abfd),
  	       (long) sec->size,
  	       (unsigned long) (sec->vma >> 32), (unsigned long) (sec->vma));
*************** mmo_write_object_contents (abfd)
*** 3311,3332 ****
     object.  */

  static long
! mmo_get_reloc_upper_bound (abfd, sec)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      asection *sec ATTRIBUTE_UNUSED;
  {
!   return sizeof (PTR);
  }

  /* Similarly canonicalize relocs to empty, filling in the terminating NULL
     pointer.  */

  long
! mmo_canonicalize_reloc (abfd, section, relptr, symbols)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      sec_ptr section ATTRIBUTE_UNUSED;
!      arelent **relptr;
!      asymbol **symbols ATTRIBUTE_UNUSED;
  {
    *relptr = NULL;
    return 0;
--- 3161,3179 ----
     object.  */

  static long
! mmo_get_reloc_upper_bound (bfd *abfd ATTRIBUTE_UNUSED,
! 			   asection *sec ATTRIBUTE_UNUSED)
  {
!   return sizeof (void *);
  }

  /* Similarly canonicalize relocs to empty, filling in the terminating NULL
     pointer.  */

  long
! mmo_canonicalize_reloc (bfd *abfd ATTRIBUTE_UNUSED,
! 			sec_ptr section ATTRIBUTE_UNUSED, arelent **relptr,
! 			asymbol **symbols ATTRIBUTE_UNUSED)
  {
    *relptr = NULL;
    return 0;

brgds, H-P


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]