gdb: add target_ops::supports_displaced_step
[deliverable/binutils-gdb.git] / bfd / xsym.c
index 6b80dcf4094643a0903d2f2ab5dff07c23604f0b..525d6d98abc1bc385acce6593fb57aca8ae7bde9 100644 (file)
@@ -1,12 +1,11 @@
 /* xSYM symbol-file support for BFD.
-   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1999-2020 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
+/* xSYM is the debugging format used by CodeWarrior on Mac OS classic.  */
+
+#include "sysdep.h"
+#include "alloca-conf.h"
 #include "xsym.h"
 #include "bfd.h"
-#include "sysdep.h"
 #include "libbfd.h"
 
-#define bfd_sym_close_and_cleanup _bfd_generic_close_and_cleanup
-#define bfd_sym_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define bfd_sym_new_section_hook _bfd_generic_new_section_hook
-#define bfd_sym_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define bfd_sym_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
-#define bfd_sym_get_lineno _bfd_nosymbols_get_lineno
-#define bfd_sym_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define bfd_sym_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define bfd_sym_read_minisymbols _bfd_generic_read_minisymbols
-#define bfd_sym_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-#define bfd_sym_get_reloc_upper_bound _bfd_norelocs_get_reloc_upper_bound
-#define bfd_sym_canonicalize_reloc _bfd_norelocs_canonicalize_reloc
-#define bfd_sym_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
-#define bfd_sym_set_arch_mach _bfd_generic_set_arch_mach
-#define bfd_sym_get_section_contents _bfd_generic_get_section_contents
-#define bfd_sym_set_section_contents _bfd_generic_set_section_contents
-#define bfd_sym_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents
-#define bfd_sym_bfd_relax_section bfd_generic_relax_section
-#define bfd_sym_bfd_gc_sections bfd_generic_gc_sections
-#define bfd_sym_bfd_merge_sections bfd_generic_merge_sections
-#define bfd_sym_bfd_is_group_section bfd_generic_is_group_section
-#define bfd_sym_bfd_discard_group bfd_generic_discard_group
-#define bfd_sym_section_already_linked \
-  _bfd_generic_section_already_linked
-#define bfd_sym_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define bfd_sym_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
-#define bfd_sym_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define bfd_sym_bfd_link_just_syms _bfd_generic_link_just_syms
-#define bfd_sym_bfd_final_link _bfd_generic_final_link
-#define bfd_sym_bfd_link_split_section _bfd_generic_link_split_section
-#define bfd_sym_get_section_contents_in_window  _bfd_generic_get_section_contents_in_window
-
-static unsigned long compute_offset
-  PARAMS ((unsigned long, unsigned long, unsigned long, unsigned long));
+#define bfd_sym_close_and_cleanup                  _bfd_generic_close_and_cleanup
+#define bfd_sym_bfd_free_cached_info               _bfd_generic_bfd_free_cached_info
+#define bfd_sym_new_section_hook                   _bfd_generic_new_section_hook
+#define bfd_sym_bfd_is_local_label_name                    bfd_generic_is_local_label_name
+#define bfd_sym_bfd_is_target_special_symbol       _bfd_bool_bfd_asymbol_false
+#define bfd_sym_get_lineno                         _bfd_nosymbols_get_lineno
+#define bfd_sym_find_nearest_line                  _bfd_nosymbols_find_nearest_line
+#define bfd_sym_find_line                          _bfd_nosymbols_find_line
+#define bfd_sym_find_inliner_info                  _bfd_nosymbols_find_inliner_info
+#define bfd_sym_get_symbol_version_string          _bfd_nosymbols_get_symbol_version_string
+#define bfd_sym_bfd_make_debug_symbol              _bfd_nosymbols_bfd_make_debug_symbol
+#define bfd_sym_read_minisymbols                   _bfd_generic_read_minisymbols
+#define bfd_sym_minisymbol_to_symbol               _bfd_generic_minisymbol_to_symbol
+#define bfd_sym_set_arch_mach                      _bfd_generic_set_arch_mach
+#define bfd_sym_get_section_contents               _bfd_generic_get_section_contents
+#define bfd_sym_set_section_contents               _bfd_generic_set_section_contents
+#define bfd_sym_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
+#define bfd_sym_bfd_relax_section                  bfd_generic_relax_section
+#define bfd_sym_bfd_gc_sections                            bfd_generic_gc_sections
+#define bfd_sym_bfd_lookup_section_flags           bfd_generic_lookup_section_flags
+#define bfd_sym_bfd_merge_sections                 bfd_generic_merge_sections
+#define bfd_sym_bfd_is_group_section               bfd_generic_is_group_section
+#define bfd_sym_bfd_group_name                     bfd_generic_group_name
+#define bfd_sym_bfd_discard_group                  bfd_generic_discard_group
+#define bfd_sym_section_already_linked             _bfd_generic_section_already_linked
+#define bfd_sym_bfd_define_common_symbol           bfd_generic_define_common_symbol
+#define bfd_sym_bfd_link_hide_symbol               _bfd_generic_link_hide_symbol
+#define bfd_sym_bfd_define_start_stop              bfd_generic_define_start_stop
+#define bfd_sym_bfd_link_hash_table_create         _bfd_generic_link_hash_table_create
+#define bfd_sym_bfd_link_add_symbols               _bfd_generic_link_add_symbols
+#define bfd_sym_bfd_link_just_syms                 _bfd_generic_link_just_syms
+#define bfd_sym_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define bfd_sym_bfd_final_link                     _bfd_generic_final_link
+#define bfd_sym_bfd_link_split_section             _bfd_generic_link_split_section
+#define bfd_sym_get_section_contents_in_window     _bfd_generic_get_section_contents_in_window
+#define bfd_sym_bfd_link_check_relocs              _bfd_generic_link_check_relocs
 
 extern const bfd_target sym_vec;
 
@@ -82,39 +88,35 @@ pstrcmp (const char *as, const char *bs)
 }
 
 static unsigned long
-compute_offset (first_page, page_size, entry_size, index)
-     unsigned long first_page;
-     unsigned long page_size;
-     unsigned long entry_size;
-     unsigned long index;
+compute_offset (unsigned long first_page,
+               unsigned long page_size,
+               unsigned long entry_size,
+               unsigned long sym_index)
 {
   unsigned long entries_per_page = page_size / entry_size;
-  unsigned long page_number = first_page + (index / entries_per_page);
-  unsigned long page_offset = (index % entries_per_page) * entry_size;
+  unsigned long page_number = first_page + (sym_index / entries_per_page);
+  unsigned long page_offset = (sym_index % entries_per_page) * entry_size;
 
   return (page_number * page_size) + page_offset;
 }
 
 bfd_boolean
-bfd_sym_mkobject (abfd)
-     bfd *abfd ATTRIBUTE_UNUSED;
+bfd_sym_mkobject (bfd *abfd ATTRIBUTE_UNUSED)
 {
   return 1;
 }
 
 void
-bfd_sym_print_symbol (abfd, afile, symbol, how)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     PTR afile ATTRIBUTE_UNUSED;
-     asymbol *symbol ATTRIBUTE_UNUSED;
-     bfd_print_symbol_type how ATTRIBUTE_UNUSED;
+bfd_sym_print_symbol (bfd *abfd ATTRIBUTE_UNUSED,
+                     void * afile ATTRIBUTE_UNUSED,
+                     asymbol *symbol ATTRIBUTE_UNUSED,
+                     bfd_print_symbol_type how ATTRIBUTE_UNUSED)
 {
   return;
 }
 
 bfd_boolean
-bfd_sym_valid (abfd)
-     bfd *abfd;
+bfd_sym_valid (bfd *abfd)
 {
   if (abfd == NULL || abfd->xvec == NULL)
     return 0;
@@ -123,35 +125,20 @@ bfd_sym_valid (abfd)
 }
 
 unsigned char *
-bfd_sym_read_name_table (abfd, dshb)
-     bfd *abfd;
-     bfd_sym_header_block *dshb;
+bfd_sym_read_name_table (bfd *abfd, bfd_sym_header_block *dshb)
 {
-  unsigned char *rstr;
-  long ret;
   size_t table_size = dshb->dshb_nte.dti_page_count * dshb->dshb_page_size;
   size_t table_offset = dshb->dshb_nte.dti_first_page * dshb->dshb_page_size;
 
-  rstr = (unsigned char *) bfd_alloc (abfd, table_size);
-  if (rstr == NULL)
-    return rstr;
-
-  bfd_seek (abfd, table_offset, SEEK_SET);
-  ret = bfd_bread (rstr, table_size, abfd);
-  if (ret < 0 || (unsigned long) ret != table_size)
-    {
-      bfd_release (abfd, rstr);
-      return NULL;
-    }
-
-  return rstr;
+  if (bfd_seek (abfd, table_offset, SEEK_SET) != 0)
+    return FALSE;
+  return _bfd_alloc_and_read (abfd, table_size, table_size);
 }
 
 void
-bfd_sym_parse_file_reference_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_file_reference *entry;
+bfd_sym_parse_file_reference_v32 (unsigned char *buf,
+                                 size_t len,
+                                 bfd_sym_file_reference *entry)
 {
   BFD_ASSERT (len == 6);
 
@@ -160,10 +147,9 @@ bfd_sym_parse_file_reference_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_disk_table_v32 (buf, len, table)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_table_info *table;
+bfd_sym_parse_disk_table_v32 (unsigned char *buf,
+                             size_t len,
+                             bfd_sym_table_info *table)
 {
   BFD_ASSERT (len == 8);
 
@@ -173,10 +159,9 @@ bfd_sym_parse_disk_table_v32 (buf, len, table)
 }
 
 void
-bfd_sym_parse_header_v32 (buf, len, header)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_header_block *header;
+bfd_sym_parse_header_v32 (unsigned char *buf,
+                         size_t len,
+                         bfd_sym_header_block *header)
 {
   BFD_ASSERT (len == 154);
 
@@ -205,9 +190,7 @@ bfd_sym_parse_header_v32 (buf, len, header)
 }
 
 int
-bfd_sym_read_header_v32 (abfd, header)
-     bfd *abfd;
-     bfd_sym_header_block *header;
+bfd_sym_read_header_v32 (bfd *abfd, bfd_sym_header_block *header)
 {
   unsigned char buf[154];
   long ret;
@@ -222,18 +205,16 @@ bfd_sym_read_header_v32 (abfd, header)
 }
 
 int
-bfd_sym_read_header_v34 (abfd, header)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_sym_header_block *header ATTRIBUTE_UNUSED;
+bfd_sym_read_header_v34 (bfd *abfd ATTRIBUTE_UNUSED,
+                        bfd_sym_header_block *header ATTRIBUTE_UNUSED)
 {
   abort ();
 }
 
 int
-bfd_sym_read_header (abfd, header, version)
-     bfd *abfd;
-     bfd_sym_header_block *header;
-     bfd_sym_version version;
+bfd_sym_read_header (bfd *abfd,
+                    bfd_sym_header_block *header,
+                    bfd_sym_version version)
 {
   switch (version)
     {
@@ -245,14 +226,12 @@ bfd_sym_read_header (abfd, header, version)
       return bfd_sym_read_header_v32 (abfd, header);
     case BFD_SYM_VERSION_3_1:
     default:
-      return FALSE;
+      return 0;
     }
 }
 
 int
-bfd_sym_read_version (abfd, version)
-     bfd *abfd;
-     bfd_sym_version *version;
+bfd_sym_read_version (bfd *abfd, bfd_sym_version *version)
 {
   char version_string[32];
   long ret;
@@ -278,10 +257,9 @@ bfd_sym_read_version (abfd, version)
 }
 
 void
-bfd_sym_display_table_summary (f, dti, name)
-     FILE *f;
-     bfd_sym_table_info *dti;
-     const char *name;
+bfd_sym_display_table_summary (FILE *f,
+                              bfd_sym_table_info *dti,
+                              const char *name)
 {
   fprintf (f, "%-6s %13ld %13ld %13ld\n",
           name,
@@ -291,9 +269,7 @@ bfd_sym_display_table_summary (f, dti, name)
 }
 
 void
-bfd_sym_display_header (f, dshb)
-     FILE *f;
-     bfd_sym_header_block *dshb;
+bfd_sym_display_header (FILE *f, bfd_sym_header_block *dshb)
 {
   fprintf (f, "            Version: %.*s\n", dshb->dshb_id[0], dshb->dshb_id + 1);
   fprintf (f, "          Page Size: 0x%x\n", dshb->dshb_page_size);
@@ -327,10 +303,9 @@ bfd_sym_display_header (f, dshb)
 }
 
 void
-bfd_sym_parse_resources_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_resources_table_entry *entry;
+bfd_sym_parse_resources_table_entry_v32 (unsigned char *buf,
+                                        size_t len,
+                                        bfd_sym_resources_table_entry *entry)
 {
   BFD_ASSERT (len == 18);
 
@@ -343,10 +318,9 @@ bfd_sym_parse_resources_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_modules_table_entry_v33 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_modules_table_entry *entry;
+bfd_sym_parse_modules_table_entry_v33 (unsigned char *buf,
+                                      size_t len,
+                                      bfd_sym_modules_table_entry *entry)
 {
   BFD_ASSERT (len == 46);
 
@@ -368,10 +342,9 @@ bfd_sym_parse_modules_table_entry_v33 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_file_references_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_file_references_table_entry *entry;
+bfd_sym_parse_file_references_table_entry_v32 (unsigned char *buf,
+                                              size_t len,
+                                              bfd_sym_file_references_table_entry *entry)
 {
   unsigned int type;
 
@@ -399,10 +372,9 @@ bfd_sym_parse_file_references_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_contained_modules_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_contained_modules_table_entry *entry;
+bfd_sym_parse_contained_modules_table_entry_v32 (unsigned char *buf,
+                                                size_t len,
+                                                bfd_sym_contained_modules_table_entry *entry)
 {
   unsigned int type;
 
@@ -425,10 +397,9 @@ bfd_sym_parse_contained_modules_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_contained_variables_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_contained_variables_table_entry *entry;
+bfd_sym_parse_contained_variables_table_entry_v32 (unsigned char *buf,
+                                                  size_t len,
+                                                  bfd_sym_contained_variables_table_entry *entry)
 {
   unsigned int type;
 
@@ -464,7 +435,8 @@ bfd_sym_parse_contained_variables_table_entry_v32 (buf, len, entry)
       else if (entry->entry.la_size <= BFD_SYM_CVTE_SCA)
        {
 #if BFD_SYM_CVTE_SCA > 0
-         memcpy (&entry->entry.address.lastruct.la, buf + 10, BFD_SYM_CVTE_SCA);
+         memcpy (&entry->entry.address.lastruct.la, buf + 10,
+                 BFD_SYM_CVTE_SCA);
 #endif
          entry->entry.address.lastruct.la_kind = buf[23];
        }
@@ -477,10 +449,9 @@ bfd_sym_parse_contained_variables_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_contained_statements_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_contained_statements_table_entry *entry;
+bfd_sym_parse_contained_statements_table_entry_v32 (unsigned char *buf,
+                                                   size_t len,
+                                                   bfd_sym_contained_statements_table_entry *entry)
 {
   unsigned int type;
 
@@ -509,10 +480,9 @@ bfd_sym_parse_contained_statements_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_contained_labels_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_contained_labels_table_entry *entry;
+bfd_sym_parse_contained_labels_table_entry_v32 (unsigned char *buf,
+                                               size_t len,
+                                               bfd_sym_contained_labels_table_entry *entry)
 {
   unsigned int type;
 
@@ -543,10 +513,9 @@ bfd_sym_parse_contained_labels_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_type_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_type_table_entry *entry;
+bfd_sym_parse_type_table_entry_v32 (unsigned char *buf,
+                                   size_t len,
+                                   bfd_sym_type_table_entry *entry)
 {
   BFD_ASSERT (len == 4);
 
@@ -554,13 +523,11 @@ bfd_sym_parse_type_table_entry_v32 (buf, len, entry)
 }
 
 int
-bfd_sym_fetch_resources_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_resources_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_resources_table_entry (bfd *abfd,
+                                    bfd_sym_resources_table_entry *entry,
+                                    unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-                         bfd_sym_resources_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_resources_table_entry *);
   unsigned long offset;
   unsigned long entry_size;
   unsigned char buf[18];
@@ -570,7 +537,7 @@ bfd_sym_fetch_resources_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -594,7 +561,7 @@ bfd_sym_fetch_resources_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_rte.dti_first_page,
                           sdata->header.dshb_page_size,
-                          entry_size, index);
+                          entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -607,13 +574,11 @@ bfd_sym_fetch_resources_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_modules_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_modules_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_modules_table_entry (bfd *abfd,
+                                  bfd_sym_modules_table_entry *entry,
+                                  unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-                         bfd_sym_modules_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_modules_table_entry *);
   unsigned long offset;
   unsigned long entry_size;
   unsigned char buf[46];
@@ -623,7 +588,7 @@ bfd_sym_fetch_modules_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -647,7 +612,7 @@ bfd_sym_fetch_modules_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_mte.dti_first_page,
                           sdata->header.dshb_page_size,
-                          entry_size, index);
+                          entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -660,13 +625,11 @@ bfd_sym_fetch_modules_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_file_references_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_file_references_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_file_references_table_entry (bfd *abfd,
+                                          bfd_sym_file_references_table_entry *entry,
+                                          unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-                         bfd_sym_file_references_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_file_references_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[8];
@@ -676,7 +639,7 @@ bfd_sym_fetch_file_references_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -699,7 +662,7 @@ bfd_sym_fetch_file_references_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_frte.dti_first_page,
                           sdata->header.dshb_page_size,
-                          entry_size, index);
+                          entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -712,13 +675,11 @@ bfd_sym_fetch_file_references_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_modules_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_modules_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_modules_table_entry (bfd *abfd,
+                                            bfd_sym_contained_modules_table_entry *entry,
+                                            unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-                         bfd_sym_contained_modules_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_modules_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[6];
@@ -728,7 +689,7 @@ bfd_sym_fetch_contained_modules_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -751,7 +712,7 @@ bfd_sym_fetch_contained_modules_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_cmte.dti_first_page,
                           sdata->header.dshb_page_size,
-                          entry_size, index);
+                          entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -764,13 +725,11 @@ bfd_sym_fetch_contained_modules_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_variables_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_variables_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_variables_table_entry (bfd *abfd,
+                                              bfd_sym_contained_variables_table_entry *entry,
+                                              unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-                         bfd_sym_contained_variables_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_variables_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[26];
@@ -780,7 +739,7 @@ bfd_sym_fetch_contained_variables_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -803,7 +762,7 @@ bfd_sym_fetch_contained_variables_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_cvte.dti_first_page,
                           sdata->header.dshb_page_size,
-                          entry_size, index);
+                          entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -816,13 +775,11 @@ bfd_sym_fetch_contained_variables_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_statements_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_statements_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_statements_table_entry (bfd *abfd,
+                                               bfd_sym_contained_statements_table_entry *entry,
+                                               unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-                         bfd_sym_contained_statements_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_statements_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[8];
@@ -832,7 +789,7 @@ bfd_sym_fetch_contained_statements_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -855,7 +812,7 @@ bfd_sym_fetch_contained_statements_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_csnte.dti_first_page,
                           sdata->header.dshb_page_size,
-                          entry_size, index);
+                          entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -868,13 +825,11 @@ bfd_sym_fetch_contained_statements_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_labels_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_labels_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_labels_table_entry (bfd *abfd,
+                                           bfd_sym_contained_labels_table_entry *entry,
+                                           unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-                         bfd_sym_contained_labels_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_labels_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[12];
@@ -884,7 +839,7 @@ bfd_sym_fetch_contained_labels_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -907,7 +862,7 @@ bfd_sym_fetch_contained_labels_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_clte.dti_first_page,
                           sdata->header.dshb_page_size,
-                          entry_size, index);
+                          entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -920,13 +875,11 @@ bfd_sym_fetch_contained_labels_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_types_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_types_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_types_table_entry (bfd *abfd,
+                                          bfd_sym_contained_types_table_entry *entry,
+                                          unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-                         bfd_sym_contained_types_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_types_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[0];
@@ -936,7 +889,7 @@ bfd_sym_fetch_contained_types_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -959,7 +912,7 @@ bfd_sym_fetch_contained_types_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_ctte.dti_first_page,
                           sdata->header.dshb_page_size,
-                          entry_size, index);
+                          entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -972,13 +925,11 @@ bfd_sym_fetch_contained_types_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_file_references_index_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_file_references_index_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_file_references_index_table_entry (bfd *abfd,
+                                                bfd_sym_file_references_index_table_entry *entry,
+                                                unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-                         bfd_sym_file_references_index_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_file_references_index_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[0];
@@ -988,7 +939,7 @@ bfd_sym_fetch_file_references_index_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -1011,7 +962,7 @@ bfd_sym_fetch_file_references_index_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_fite.dti_first_page,
                           sdata->header.dshb_page_size,
-                          entry_size, index);
+                          entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -1024,13 +975,11 @@ bfd_sym_fetch_file_references_index_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_constant_pool_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_constant_pool_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_constant_pool_entry (bfd *abfd,
+                                  bfd_sym_constant_pool_entry *entry,
+                                  unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-                         bfd_sym_constant_pool_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_constant_pool_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[0];
@@ -1040,7 +989,7 @@ bfd_sym_fetch_constant_pool_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -1063,7 +1012,7 @@ bfd_sym_fetch_constant_pool_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_fite.dti_first_page,
                           sdata->header.dshb_page_size,
-                          entry_size, index);
+                          entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -1076,13 +1025,11 @@ bfd_sym_fetch_constant_pool_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_type_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_type_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_type_table_entry (bfd *abfd,
+                               bfd_sym_type_table_entry *entry,
+                               unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-                         bfd_sym_type_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_type_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[4];
@@ -1112,7 +1059,7 @@ bfd_sym_fetch_type_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_tte.dti_first_page,
                           sdata->header.dshb_page_size,
-                          entry_size, index);
+                          entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -1125,16 +1072,13 @@ bfd_sym_fetch_type_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_type_information_table_entry (abfd, entry, offset)
-     bfd *abfd;
-     bfd_sym_type_information_table_entry *entry;
-     unsigned long offset;
+bfd_sym_fetch_type_information_table_entry (bfd *abfd,
+                                           bfd_sym_type_information_table_entry *entry,
+                                           unsigned long offset)
 {
   unsigned char buf[4];
-  bfd_sym_data_struct *sdata = NULL;
 
   BFD_ASSERT (bfd_sym_valid (abfd));
-  sdata = abfd->tdata.sym_data;
 
   if (offset == 0)
     return -1;
@@ -1171,10 +1115,9 @@ bfd_sym_fetch_type_information_table_entry (abfd, entry, offset)
 }
 
 int
-bfd_sym_fetch_type_table_information (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_type_information_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_type_table_information (bfd *abfd,
+                                     bfd_sym_type_information_table_entry *entry,
+                                     unsigned long sym_index)
 {
   bfd_sym_type_table_entry tindex;
   bfd_sym_data_struct *sdata = NULL;
@@ -1184,10 +1127,10 @@ bfd_sym_fetch_type_table_information (abfd, entry, index)
 
   if (sdata->header.dshb_tte.dti_object_count <= 99)
     return -1;
-  if (index < 100)
+  if (sym_index < 100)
     return -1;
 
-  if (bfd_sym_fetch_type_table_entry (abfd, &tindex, index - 100) < 0)
+  if (bfd_sym_fetch_type_table_entry (abfd, &tindex, sym_index - 100) < 0)
     return -1;
   if (bfd_sym_fetch_type_information_table_entry (abfd, entry, tindex) < 0)
     return -1;
@@ -1196,42 +1139,37 @@ bfd_sym_fetch_type_table_information (abfd, entry, index)
 }
 
 const unsigned char *
-bfd_sym_symbol_name (abfd, index)
-     bfd *abfd;
-     unsigned long index;
+bfd_sym_symbol_name (bfd *abfd, unsigned long sym_index)
 {
   bfd_sym_data_struct *sdata = NULL;
 
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return (const unsigned char *) "";
 
-  index *= 2;
-  if ((index / sdata->header.dshb_page_size)
+  sym_index *= 2;
+  if ((sym_index / sdata->header.dshb_page_size)
       > sdata->header.dshb_nte.dti_page_count)
     return (const unsigned char *) "\09[INVALID]";
 
-  return (const unsigned char *) sdata->name_table + index;
+  return (const unsigned char *) sdata->name_table + sym_index;
 }
 
 const unsigned char *
-bfd_sym_module_name (abfd, index)
-     bfd *abfd;
-     unsigned long index;
+bfd_sym_module_name (bfd *abfd, unsigned long sym_index)
 {
   bfd_sym_modules_table_entry entry;
 
-  if (bfd_sym_fetch_modules_table_entry (abfd, &entry, index) < 0)
+  if (bfd_sym_fetch_modules_table_entry (abfd, &entry, sym_index) < 0)
     return (const unsigned char *) "\09[INVALID]";
 
   return bfd_sym_symbol_name (abfd, entry.mte_nte_index);
 }
 
 const char *
-bfd_sym_unparse_storage_kind (kind)
-     enum bfd_sym_storage_kind kind;
+bfd_sym_unparse_storage_kind (enum bfd_sym_storage_kind kind)
 {
   switch (kind)
     {
@@ -1244,8 +1182,7 @@ bfd_sym_unparse_storage_kind (kind)
 }
 
 const char *
-bfd_sym_unparse_storage_class (kind)
-     enum bfd_sym_storage_class kind;
+bfd_sym_unparse_storage_class (enum bfd_sym_storage_class kind)
 {
   switch (kind)
     {
@@ -1262,8 +1199,7 @@ bfd_sym_unparse_storage_class (kind)
 }
 
 const char *
-bfd_sym_unparse_module_kind (kind)
-     enum bfd_sym_module_kind kind;
+bfd_sym_unparse_module_kind (enum bfd_sym_module_kind kind)
 {
   switch (kind)
     {
@@ -1279,8 +1215,7 @@ bfd_sym_unparse_module_kind (kind)
 }
 
 const char *
-bfd_sym_unparse_symbol_scope (scope)
-     enum bfd_sym_symbol_scope scope;
+bfd_sym_unparse_symbol_scope (enum bfd_sym_symbol_scope scope)
 {
   switch (scope)
     {
@@ -1292,10 +1227,9 @@ bfd_sym_unparse_symbol_scope (scope)
 }
 
 void
-bfd_sym_print_file_reference (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_file_reference *entry;
+bfd_sym_print_file_reference (bfd *abfd,
+                             FILE *f,
+                             bfd_sym_file_reference *entry)
 {
   bfd_sym_file_references_table_entry frtentry;
   int ret;
@@ -1315,10 +1249,9 @@ bfd_sym_print_file_reference (abfd, f, entry)
 }
 
 void
-bfd_sym_print_resources_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_resources_table_entry *entry;
+bfd_sym_print_resources_table_entry (bfd *abfd,
+                                    FILE *f,
+                                    bfd_sym_resources_table_entry *entry)
 {
   fprintf (f, " \"%.*s\" (NTE %lu), type \"%.4s\", num %u, size %lu, MTE %lu -- %lu",
           bfd_sym_symbol_name (abfd, entry->rte_nte_index)[0],
@@ -1328,10 +1261,9 @@ bfd_sym_print_resources_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_modules_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_modules_table_entry *entry;
+bfd_sym_print_modules_table_entry (bfd *abfd,
+                                  FILE *f,
+                                  bfd_sym_modules_table_entry *entry)
 {
   fprintf (f, "\"%.*s\" (NTE %lu)",
           bfd_sym_symbol_name (abfd, entry->mte_nte_index)[0],
@@ -1371,10 +1303,9 @@ bfd_sym_print_modules_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_file_references_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_file_references_table_entry *entry;
+bfd_sym_print_file_references_table_entry (bfd *abfd,
+                                          FILE *f,
+                                          bfd_sym_file_references_table_entry *entry)
 {
   switch (entry->generic.type)
     {
@@ -1404,10 +1335,9 @@ bfd_sym_print_file_references_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_modules_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_contained_modules_table_entry *entry;
+bfd_sym_print_contained_modules_table_entry (bfd *abfd,
+                                            FILE *f,
+                                            bfd_sym_contained_modules_table_entry *entry)
 {
   switch (entry->generic.type)
     {
@@ -1426,10 +1356,9 @@ bfd_sym_print_contained_modules_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_variables_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_contained_variables_table_entry *entry;
+bfd_sym_print_contained_variables_table_entry (bfd *abfd,
+                                              FILE *f,
+                                              bfd_sym_contained_variables_table_entry *entry)
 {
   if (entry->generic.type == BFD_SYM_END_OF_LIST)
     {
@@ -1477,10 +1406,9 @@ bfd_sym_print_contained_variables_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_statements_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_contained_statements_table_entry *entry;
+bfd_sym_print_contained_statements_table_entry (bfd *abfd,
+                                               FILE *f,
+                                               bfd_sym_contained_statements_table_entry *entry)
 {
   if (entry->generic.type == BFD_SYM_END_OF_LIST)
     {
@@ -1504,10 +1432,9 @@ bfd_sym_print_contained_statements_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_labels_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_contained_labels_table_entry *entry;
+bfd_sym_print_contained_labels_table_entry (bfd *abfd,
+                                           FILE *f,
+                                           bfd_sym_contained_labels_table_entry *entry)
 {
   if (entry->generic.type == BFD_SYM_END_OF_LIST)
     {
@@ -1532,17 +1459,15 @@ bfd_sym_print_contained_labels_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_types_table_entry (abfd, f, entry)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     FILE *f;
-     bfd_sym_contained_types_table_entry *entry ATTRIBUTE_UNUSED;
+bfd_sym_print_contained_types_table_entry (bfd *abfd ATTRIBUTE_UNUSED,
+                                          FILE *f,
+                                          bfd_sym_contained_types_table_entry *entry ATTRIBUTE_UNUSED)
 {
   fprintf (f, "[UNIMPLEMENTED]");
 }
 
 const char *
-bfd_sym_type_operator_name (num)
-     unsigned char num;
+bfd_sym_type_operator_name (unsigned char num)
 {
   switch (num)
     {
@@ -1565,8 +1490,7 @@ bfd_sym_type_operator_name (num)
 }
 
 const char *
-bfd_sym_type_basic_name (num)
-     unsigned char num;
+bfd_sym_type_basic_name (unsigned char num)
 {
   switch (num)
     {
@@ -1593,12 +1517,11 @@ bfd_sym_type_basic_name (num)
 }
 
 int
-bfd_sym_fetch_long (buf, len, offset, offsetptr, value)
-     unsigned char *buf;
-     unsigned long len;
-     unsigned long offset;
-     unsigned long *offsetptr;
-     long *value;
+bfd_sym_fetch_long (unsigned char *buf,
+                   unsigned long len,
+                   unsigned long offset,
+                   unsigned long *offsetptr,
+                   long *value)
 {
   int ret;
 
@@ -1660,13 +1583,12 @@ bfd_sym_fetch_long (buf, len, offset, offsetptr, value)
 }
 
 void
-bfd_sym_print_type_information (abfd, f, buf, len, offset, offsetptr)
-     bfd *abfd;
-     FILE *f;
-     unsigned char *buf;
-     unsigned long len;
-     unsigned long offset;
-     unsigned long *offsetptr;
+bfd_sym_print_type_information (bfd *abfd,
+                               FILE *f,
+                               unsigned char *buf,
+                               unsigned long len,
+                               unsigned long offset,
+                               unsigned long *offsetptr)
 {
   unsigned int type;
 
@@ -1715,7 +1637,7 @@ bfd_sym_print_type_information (abfd, f, buf, len, offset, offsetptr)
                       bfd_sym_symbol_name (abfd, tinfo.nte_index)[0],
                       &bfd_sym_symbol_name (abfd, tinfo.nte_index)[1]);
          }
-       fprintf (f, " (TTE %lu)", value);
+       fprintf (f, " (TTE %lu)", (unsigned long) value);
        break;
       }
 
@@ -1776,13 +1698,13 @@ bfd_sym_print_type_information (abfd, f, buf, len, offset, offsetptr)
          fprintf (f, "union (0x%x) of ", type);
 
        bfd_sym_fetch_long (buf, len, offset, &offset, &nrec);
-       fprintf (f, "%lu elements: ", nrec);
+       fprintf (f, "%lu elements: ", (unsigned long) nrec);
 
        for (i = 0; i < nrec; i++)
          {
            bfd_sym_fetch_long (buf, len, offset, &offset, &eloff);
            fprintf (f, "\n                ");
-           fprintf (f, "offset %lu: ", eloff);
+           fprintf (f, "offset %lu: ", (unsigned long) eloff);
            bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
          }
        break;
@@ -1810,7 +1732,7 @@ bfd_sym_print_type_information (abfd, f, buf, len, offset, offsetptr)
                 bfd_sym_symbol_name (abfd, value)[0],
                 &bfd_sym_symbol_name (abfd, value)[1]);
 
-      fprintf (f, " (NTE %lu) with type ", value);
+      fprintf (f, " (NTE %lu) with type ", (unsigned long) value);
       bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
       break;
     }
@@ -1858,10 +1780,9 @@ bfd_sym_print_type_information (abfd, f, buf, len, offset, offsetptr)
 }
 
 void
-bfd_sym_print_type_information_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_type_information_table_entry *entry;
+bfd_sym_print_type_information_table_entry (bfd *abfd,
+                                           FILE *f,
+                                           bfd_sym_type_information_table_entry *entry)
 {
   unsigned char *buf;
   unsigned long offset;
@@ -1875,18 +1796,9 @@ bfd_sym_print_type_information_table_entry (abfd, f, entry)
 
   fprintf (f, "\n            ");
 
-  buf = alloca (entry->physical_size);
-  if (buf == NULL)
-    {
-      fprintf (f, "[ERROR]\n");
-      return;
-    }
-  if (bfd_seek (abfd, entry->offset, SEEK_SET) < 0)
-    {
-      fprintf (f, "[ERROR]\n");
-      return;
-    }
-  if (bfd_bread (buf, entry->physical_size, abfd) != entry->physical_size)
+  if (bfd_seek (abfd, entry->offset, SEEK_SET) != 0
+      || (buf = _bfd_malloc_and_read (abfd, entry->physical_size,
+                                     entry->physical_size)) == NULL)
     {
       fprintf (f, "[ERROR]\n");
       return;
@@ -1907,50 +1819,49 @@ bfd_sym_print_type_information_table_entry (abfd, f, entry)
   bfd_sym_print_type_information (abfd, f, buf, entry->physical_size, 0, &offset);
 
   if (offset != entry->physical_size)
-    fprintf (f, "\n            [parser used %lu bytes instead of %lu]", offset, entry->physical_size);        }
+    fprintf (f, "\n            [parser used %lu bytes instead of %lu]", offset, entry->physical_size);
+  free (buf);
+}
 
 void
-bfd_sym_print_file_references_index_table_entry (abfd, f, entry)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     FILE *f;
-     bfd_sym_file_references_index_table_entry *entry ATTRIBUTE_UNUSED;
+bfd_sym_print_file_references_index_table_entry (bfd *abfd ATTRIBUTE_UNUSED,
+                                                FILE *f,
+                                                bfd_sym_file_references_index_table_entry *entry ATTRIBUTE_UNUSED)
 {
   fprintf (f, "[UNIMPLEMENTED]");
 }
 
 void
-bfd_sym_print_constant_pool_entry (abfd, f, entry)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     FILE *f;
-     bfd_sym_constant_pool_entry *entry ATTRIBUTE_UNUSED;
+bfd_sym_print_constant_pool_entry (bfd *abfd ATTRIBUTE_UNUSED,
+                                  FILE *f,
+                                  bfd_sym_constant_pool_entry *entry ATTRIBUTE_UNUSED)
 {
   fprintf (f, "[UNIMPLEMENTED]");
 }
 
 unsigned char *
-bfd_sym_display_name_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     unsigned char *entry;
+bfd_sym_display_name_table_entry (bfd *abfd,
+                                 FILE *f,
+                                 unsigned char *entry)
 {
-  unsigned long index;
+  unsigned long sym_index;
   unsigned long offset;
   bfd_sym_data_struct *sdata = NULL;
 
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
-  index = (entry - sdata->name_table) / 2;
+  sym_index = (entry - sdata->name_table) / 2;
 
   if (sdata->version >= BFD_SYM_VERSION_3_4 && entry[0] == 255 && entry[1] == 0)
     {
       unsigned short length = bfd_getb16 (entry + 2);
-      fprintf (f, "[%8lu] \"%.*s\"\n", index, length, entry + 4);
+      fprintf (f, "[%8lu] \"%.*s\"\n", sym_index, length, entry + 4);
       offset = 2 + length + 1;
     }
   else
     {
       if (! (entry[0] == 0 || (entry[0] == 1 && entry[1] == '\0')))
-       fprintf (f, "[%8lu] \"%.*s\"\n", index, entry[0], entry + 1);
+       fprintf (f, "[%8lu] \"%.*s\"\n", sym_index, entry[0], entry + 1);
 
       if (sdata->version >= BFD_SYM_VERSION_3_4)
        offset = entry[0] + 2;
@@ -1962,9 +1873,7 @@ bfd_sym_display_name_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_display_name_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_name_table (bfd *abfd, FILE *f)
 {
   unsigned long name_table_len;
   unsigned char *name_table, *name_table_end, *cur;
@@ -1989,9 +1898,7 @@ bfd_sym_display_name_table (abfd, f)
 }
 
 void
-bfd_sym_display_resources_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_resources_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_resources_table_entry entry;
@@ -2017,9 +1924,7 @@ bfd_sym_display_resources_table (abfd, f)
 }
 
 void
-bfd_sym_display_modules_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_modules_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_modules_table_entry entry;
@@ -2045,9 +1950,7 @@ bfd_sym_display_modules_table (abfd, f)
 }
 
 void
-bfd_sym_display_file_references_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_file_references_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_file_references_table_entry entry;
@@ -2073,9 +1976,7 @@ bfd_sym_display_file_references_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_modules_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_modules_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_modules_table_entry entry;
@@ -2101,9 +2002,7 @@ bfd_sym_display_contained_modules_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_variables_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_variables_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_variables_table_entry entry;
@@ -2131,9 +2030,7 @@ bfd_sym_display_contained_variables_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_statements_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_statements_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_statements_table_entry entry;
@@ -2159,9 +2056,7 @@ bfd_sym_display_contained_statements_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_labels_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_labels_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_labels_table_entry entry;
@@ -2187,9 +2082,7 @@ bfd_sym_display_contained_labels_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_types_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_types_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_types_table_entry entry;
@@ -2215,9 +2108,7 @@ bfd_sym_display_contained_types_table (abfd, f)
 }
 
 void
-bfd_sym_display_file_references_index_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_file_references_index_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_file_references_index_table_entry entry;
@@ -2243,9 +2134,7 @@ bfd_sym_display_file_references_index_table (abfd, f)
 }
 
 void
-bfd_sym_display_constant_pool (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_constant_pool (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_constant_pool_entry entry;
@@ -2271,12 +2160,10 @@ bfd_sym_display_constant_pool (abfd, f)
 }
 
 void
-bfd_sym_display_type_information_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_type_information_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
-  bfd_sym_type_table_entry index;
+  bfd_sym_type_table_entry sym_index;
   bfd_sym_type_information_table_entry entry;
   bfd_sym_data_struct *sdata = NULL;
 
@@ -2294,13 +2181,13 @@ bfd_sym_display_type_information_table (abfd, f)
 
   for (i = 100; i <= sdata->header.dshb_tte.dti_object_count; i++)
     {
-      if (bfd_sym_fetch_type_table_entry (abfd, &index, i - 100) < 0)
+      if (bfd_sym_fetch_type_table_entry (abfd, &sym_index, i - 100) < 0)
        fprintf (f, " [%8lu] [INVALID]\n", i);
       else
        {
-         fprintf (f, " [%8lu] (TINFO %lu) ", i, index);
+         fprintf (f, " [%8lu] (TINFO %lu) ", i, sym_index);
 
-         if (bfd_sym_fetch_type_information_table_entry (abfd, &entry, index) < 0)
+         if (bfd_sym_fetch_type_information_table_entry (abfd, &entry, sym_index) < 0)
            fprintf (f, "[INVALID]");
          else
            bfd_sym_print_type_information_table_entry (abfd, f, &entry);
@@ -2311,10 +2198,7 @@ bfd_sym_display_type_information_table (abfd, f)
 }
 
 int
-bfd_sym_scan (abfd, version, mdata)
-     bfd *abfd;
-     bfd_sym_version version;
-     bfd_sym_data_struct *mdata;
+bfd_sym_scan (bfd *abfd, bfd_sym_version version, bfd_sym_data_struct *mdata)
 {
   asection *bfdsec;
   const char *name = "symbols";
@@ -2331,7 +2215,7 @@ bfd_sym_scan (abfd, version, mdata)
   if (mdata->name_table == NULL)
     return -1;
 
-  bfdsec = bfd_make_section_anyway (abfd, name);
+  bfdsec = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS);
   if (bfdsec == NULL)
     return -1;
 
@@ -2341,122 +2225,102 @@ bfd_sym_scan (abfd, version, mdata)
   bfdsec->filepos = 0;
   bfdsec->alignment_power = 0;
 
-  bfdsec->flags = SEC_HAS_CONTENTS;
-
   abfd->tdata.sym_data = mdata;
 
   return 0;
 }
 
-const bfd_target *
-bfd_sym_object_p (abfd)
-     bfd *abfd;
+bfd_cleanup
+bfd_sym_object_p (bfd *abfd)
 {
-  struct bfd_preserve preserve;
   bfd_sym_version version = -1;
+  bfd_sym_data_struct *mdata;
 
-  preserve.marker = NULL;
   bfd_seek (abfd, 0, SEEK_SET);
   if (bfd_sym_read_version (abfd, &version) != 0)
     goto wrong;
 
-  preserve.marker = bfd_alloc (abfd, sizeof (bfd_sym_data_struct));
-  if (preserve.marker == NULL
-      || ! bfd_preserve_save (abfd, &preserve))
+  mdata = (bfd_sym_data_struct *) bfd_alloc (abfd, sizeof (*mdata));
+  if (mdata == NULL)
     goto fail;
 
-  if (bfd_sym_scan (abfd, version,
-                   (bfd_sym_data_struct *) preserve.marker) != 0)
+  if (bfd_sym_scan (abfd, version, mdata) != 0)
     goto wrong;
 
-  bfd_preserve_finish (abfd, &preserve);
-  return abfd->xvec;
+  return _bfd_no_cleanup;
 
  wrong:
   bfd_set_error (bfd_error_wrong_format);
 
  fail:
-  if (preserve.marker != NULL)
-    bfd_preserve_restore (abfd, &preserve);
   return NULL;
 }
 
-asymbol *
-bfd_sym_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  return (asymbol *) bfd_alloc (abfd, sizeof (asymbol));
-}
+#define bfd_sym_make_empty_symbol _bfd_generic_make_empty_symbol
 
 void
-bfd_sym_get_symbol_info (abfd, symbol, ret)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     asymbol *symbol;
-     symbol_info *ret;
+bfd_sym_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED, asymbol *symbol, symbol_info *ret)
 {
   bfd_symbol_info (symbol, ret);
 }
 
 long
-bfd_sym_get_symtab_upper_bound (abfd)
-     bfd *abfd ATTRIBUTE_UNUSED;
+bfd_sym_get_symtab_upper_bound (bfd *abfd ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 long
-bfd_sym_canonicalize_symtab (abfd, sym)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     asymbol **sym ATTRIBUTE_UNUSED;
+bfd_sym_canonicalize_symtab (bfd *abfd ATTRIBUTE_UNUSED, asymbol **sym ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 int
-bfd_sym_sizeof_headers (abfd, exec)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_boolean exec ATTRIBUTE_UNUSED;
+bfd_sym_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+                       struct bfd_link_info *info ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 const bfd_target sym_vec =
 {
-  "sym",                       /* name */
-  bfd_target_sym_flavour,      /* flavour */
-  BFD_ENDIAN_BIG,              /* byteorder */
-  BFD_ENDIAN_BIG,              /* header_byteorder */
-  (HAS_RELOC | EXEC_P |                /* object flags */
+  "sym",                       /* Name.  */
+  bfd_target_sym_flavour,      /* Flavour.  */
+  BFD_ENDIAN_BIG,              /* Byteorder.  */
+  BFD_ENDIAN_BIG,              /* Header byteorder.  */
+  (HAS_RELOC | EXEC_P |                /* Object flags.  */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
   (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_DATA
-   | SEC_ROM | SEC_HAS_CONTENTS), /* section_flags */
-  0,                           /* symbol_leading_char */
-  ' ',                         /* ar_pad_char */
-  16,                          /* ar_max_namelen */
+   | SEC_ROM | SEC_HAS_CONTENTS), /* Section_flags.  */
+  0,                           /* Symbol_leading_char.  */
+  ' ',                         /* AR_pad_char.  */
+  16,                          /* AR_max_namelen.  */
+  0,                           /* match priority.  */
   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_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_check_format */
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* Hdrs.  */
+  {                            /* bfd_check_format */
     _bfd_dummy_target,
-    bfd_sym_object_p,          /* bfd_check_format */
+    bfd_sym_object_p,          /* bfd_check_format */
     _bfd_dummy_target,
     _bfd_dummy_target,
   },
-  {                            /* bfd_set_format */
-    bfd_false,
+  {                            /* bfd_set_format */
+    _bfd_bool_bfd_false_error,
     bfd_sym_mkobject,
-    bfd_false,
-    bfd_false,
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_false_error,
   },
-  {                            /* bfd_write_contents */
-    bfd_false,
-    bfd_true,
-    bfd_false,
-    bfd_false,
+  {                            /* bfd_write_contents */
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_true,
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_false_error,
   },
 
   BFD_JUMP_TABLE_GENERIC (bfd_sym),
@@ -2464,7 +2328,7 @@ const bfd_target sym_vec =
   BFD_JUMP_TABLE_CORE (_bfd_nocore),
   BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
   BFD_JUMP_TABLE_SYMBOLS (bfd_sym),
-  BFD_JUMP_TABLE_RELOCS (bfd_sym),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
   BFD_JUMP_TABLE_WRITE (bfd_sym),
   BFD_JUMP_TABLE_LINK (bfd_sym),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
@@ -2473,4 +2337,3 @@ const bfd_target sym_vec =
 
   NULL
 };
-
This page took 0.044104 seconds and 4 git commands to generate.