X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Foasys.c;h=e51cde6c4d022be706a3efe5a40dc12952193f05;hb=f592407e4d75fc64e87c25cdd8b21361b3d322d1;hp=3c393864cf60bf0e57f2cabb9403009e9335033a;hpb=68bfbfcc5aa8bda806bef9edf274059d6ad571fc;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/oasys.c b/bfd/oasys.c index 3c393864cf..e51cde6c4d 100644 --- a/bfd/oasys.c +++ b/bfd/oasys.c @@ -1,6 +1,6 @@ /* BFD back-end for oasys objects. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2001, - 2002, 2003 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support, . This file is part of BFD, the Binary File Descriptor library. @@ -17,7 +17,7 @@ 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. */ #define UNDERSCORE_HACK 1 #include "bfd.h" @@ -27,114 +27,44 @@ #include "oasys.h" #include "liboasys.h" -static bfd_boolean oasys_slurp_section_data - PARAMS ((bfd * const)); -static bfd_boolean oasys_read_record - PARAMS ((bfd *, oasys_record_union_type *)); -static bfd_boolean oasys_write_sections - PARAMS ((bfd *)); -static bfd_boolean oasys_write_record - PARAMS ((bfd *, oasys_record_enum_type, oasys_record_union_type *, size_t)); -static bfd_boolean oasys_write_syms - PARAMS ((bfd *)); -static bfd_boolean oasys_write_header - PARAMS ((bfd *)); -static bfd_boolean oasys_write_end - PARAMS ((bfd *)); -static bfd_boolean oasys_write_data - PARAMS ((bfd *)); -static size_t oasys_string_length - PARAMS ((oasys_record_union_type *)); -static bfd_boolean oasys_slurp_symbol_table - PARAMS ((bfd *const)); -static long int oasys_get_symtab_upper_bound - PARAMS ((bfd *const)); -static const bfd_target *oasys_archive_p - PARAMS ((bfd *)); -static bfd_boolean oasys_mkobject - PARAMS ((bfd *)); -static const bfd_target *oasys_object_p - PARAMS ((bfd *)); -static void oasys_get_symbol_info - PARAMS ((bfd *, asymbol *, symbol_info *)); -static void oasys_print_symbol - PARAMS ((bfd *, void *, asymbol *, bfd_print_symbol_type)); -static bfd_boolean oasys_new_section_hook - PARAMS ((bfd *, asection *)); -static long int oasys_get_reloc_upper_bound - PARAMS ((bfd *, sec_ptr)); -static bfd_boolean oasys_get_section_contents - PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type)); -static int comp - PARAMS ((const void *, const void *)); -static bfd_boolean oasys_write_object_contents - PARAMS ((bfd *)); -static bfd_boolean oasys_set_section_contents - PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type)); -static asymbol *oasys_make_empty_symbol - PARAMS ((bfd *)); -static bfd *oasys_openr_next_archived_file - PARAMS ((bfd *, bfd *)); -static bfd_boolean oasys_find_nearest_line - PARAMS ((bfd *, asection *, asymbol **, bfd_vma, - const char **, const char **, unsigned int *)); -static int oasys_generic_stat_arch_elt - PARAMS ((bfd *, struct stat *)); -static int oasys_sizeof_headers - PARAMS ((bfd *, bfd_boolean)); - -long oasys_get_symtab - PARAMS ((bfd *, asymbol **)); -long oasys_canonicalize_reloc - PARAMS ((bfd *, sec_ptr, arelent **, asymbol **)); - /* Read in all the section data and relocation stuff too. */ static bfd_boolean -oasys_read_record (abfd, record) - bfd *abfd; - oasys_record_union_type *record; +oasys_read_record (bfd *abfd, oasys_record_union_type *record) { bfd_size_type amt = sizeof (record->header); - if (bfd_bread ((PTR) record, amt, abfd) != amt) + + if (bfd_bread ((void *) record, amt, abfd) != amt) return FALSE; amt = record->header.length - sizeof (record->header); if ((long) amt <= 0) return TRUE; - if (bfd_bread ((PTR) ((char *) record + sizeof (record->header)), amt, abfd) + if (bfd_bread ((void *) ((char *) record + sizeof (record->header)), amt, abfd) != amt) return FALSE; return TRUE; } static size_t -oasys_string_length (record) - oasys_record_union_type *record; +oasys_string_length (oasys_record_union_type *record) { return record->header.length - ((char *) record->symbol.name - (char *) record); } -/*****************************************************************************/ - -/* - -Slurp the symbol table by reading in all the records at the start file -till we get to the first section record. +/* Slurp the symbol table by reading in all the records at the start file + till we get to the first section record. -We'll sort the symbolss into two lists, defined and undefined. The -undefined symbols will be placed into the table according to their -refno. + We'll sort the symbolss into two lists, defined and undefined. The + undefined symbols will be placed into the table according to their + refno. -We do this by placing all undefined symbols at the front of the table -moving in, and the defined symbols at the end of the table moving back. - -*/ + We do this by placing all undefined symbols at the front of the table + moving in, and the defined symbols at the end of the table moving back. */ static bfd_boolean -oasys_slurp_symbol_table (abfd) - bfd *const abfd; +oasys_slurp_symbol_table (bfd *const abfd) { oasys_record_union_type record; oasys_data_type *data = OASYS_DATA (abfd); @@ -144,18 +74,17 @@ oasys_slurp_symbol_table (abfd) char *string_ptr; bfd_size_type amt; - if (data->symbols != (asymbol *) NULL) - { - return TRUE; - } - /* Buy enough memory for all the symbols and all the names */ + if (data->symbols != NULL) + return TRUE; + + /* Buy enough memory for all the symbols and all the names. */ amt = abfd->symcount; amt *= sizeof (asymbol); - data->symbols = (asymbol *) bfd_alloc (abfd, amt); + data->symbols = bfd_alloc (abfd, amt); amt = data->symbol_string_length; #ifdef UNDERSCORE_HACK - /* buy 1 more char for each symbol to keep the underscore in*/ + /* Buy 1 more char for each symbol to keep the underscore in. */ amt += abfd->symcount; #endif data->strings = bfd_alloc (abfd, amt); @@ -170,9 +99,9 @@ oasys_slurp_symbol_table (abfd) return FALSE; while (loop) { - if (! oasys_read_record (abfd, &record)) return FALSE; + switch (record.header.type) { case oasys_record_is_header_enum: @@ -183,7 +112,6 @@ oasys_slurp_symbol_table (abfd) int flag = record.header.type == (int) oasys_record_is_local_enum ? (BSF_LOCAL) : (BSF_GLOBAL | BSF_EXPORT); - size_t length = oasys_string_length (&record); switch (record.symbol.relb & RELOCATION_TYPE_BITS) { @@ -210,10 +138,7 @@ oasys_slurp_symbol_table (abfd) } } else - { - - dest->flags = flag; - } + dest->flags = flag; break; case RELOCATION_TYPE_UND: dest = data->symbols + H_GET_16 (abfd, record.symbol.refno); @@ -223,18 +148,16 @@ oasys_slurp_symbol_table (abfd) dest = dest_defined--; dest->name = string_ptr; dest->the_bfd = abfd; - dest->section = bfd_com_section_ptr; - break; default: dest = dest_defined--; - BFD_ASSERT (0); + BFD_ASSERT (FALSE); break; } dest->name = string_ptr; dest->the_bfd = abfd; - dest->udata.p = (PTR) NULL; + dest->udata.p = NULL; dest->value = H_GET_32 (abfd, record.symbol.value); #ifdef UNDERSCORE_HACK @@ -246,7 +169,6 @@ oasys_slurp_symbol_table (abfd) #endif memcpy (string_ptr, record.symbol.name, length); - string_ptr[length] = 0; string_ptr += length + 1; } @@ -259,8 +181,7 @@ oasys_slurp_symbol_table (abfd) } static long -oasys_get_symtab_upper_bound (abfd) - bfd *const abfd; +oasys_get_symtab_upper_bound (bfd *const abfd) { if (! oasys_slurp_symbol_table (abfd)) return -1; @@ -270,33 +191,27 @@ oasys_get_symtab_upper_bound (abfd) extern const bfd_target oasys_vec; -long -oasys_get_symtab (abfd, location) - bfd *abfd; - asymbol **location; +static long +oasys_canonicalize_symtab (bfd *abfd, asymbol **location) { asymbol *symbase; unsigned int counter; + if (! oasys_slurp_symbol_table (abfd)) - { - return -1; - } + return -1; + symbase = OASYS_DATA (abfd)->symbols; for (counter = 0; counter < abfd->symcount; counter++) - { - *(location++) = symbase++; - } + *(location++) = symbase++; + *location = 0; return abfd->symcount; } -/*********************************************************************** -* archive stuff -*/ +/* Archive stuff. */ static const bfd_target * -oasys_archive_p (abfd) - bfd *abfd; +oasys_archive_p (bfd *abfd) { oasys_archive_header_type header; oasys_extarchive_header_type header_ext; @@ -306,7 +221,7 @@ oasys_archive_p (abfd) amt = sizeof (header_ext); if (bfd_seek (abfd, (file_ptr) 0, 0) != 0 - || bfd_bread ((PTR) &header_ext, amt, abfd) != amt) + || bfd_bread ((void *) &header_ext, amt, abfd) != amt) { if (bfd_get_error () != bfd_error_system_call) bfd_set_error (bfd_error_wrong_format); @@ -322,33 +237,29 @@ oasys_archive_p (abfd) header.xref_count = H_GET_32 (abfd, header_ext.xref_count); header.xref_lst_offset = H_GET_32 (abfd, header_ext.xref_lst_offset); - /* - There isn't a magic number in an Oasys archive, so the best we - can do to verify reasnableness is to make sure that the values in - the header are too weird - */ - - if (header.version > 10000 || - header.mod_count > 10000 || - header.sym_count > 100000 || - header.xref_count > 100000) - return (const bfd_target *) NULL; - - /* - That all worked, let's buy the space for the header and read in - the headers. - */ + /* There isn't a magic number in an Oasys archive, so the best we + can do to verify reasonableness is to make sure that the values in + the header are too weird. */ + + if (header.version > 10000 + || header.mod_count > 10000 + || header.sym_count > 100000 + || header.xref_count > 100000) + return NULL; + + /* That all worked, let's buy the space for the header and read in + the headers. */ { oasys_ar_data_type *ar; oasys_module_info_type *module; oasys_module_table_type record; amt = sizeof (oasys_ar_data_type); - ar = (oasys_ar_data_type *) bfd_alloc (abfd, amt); + ar = bfd_alloc (abfd, amt); amt = header.mod_count; amt *= sizeof (oasys_module_info_type); - module = (oasys_module_info_type *) bfd_alloc (abfd, amt); + module = bfd_alloc (abfd, amt); if (!ar || !module) return NULL; @@ -363,40 +274,12 @@ oasys_archive_p (abfd) if (bfd_seek (abfd, filepos, SEEK_SET) != 0) return NULL; - /* There are two ways of specifying the archive header */ - - if (0) - { - oasys_extmodule_table_type_a_type record_ext; - - amt = sizeof (record_ext); - if (bfd_bread ((PTR) &record_ext, amt, abfd) != amt) - return NULL; - - record.mod_size = H_GET_32 (abfd, record_ext.mod_size); - record.file_offset = H_GET_32 (abfd, record_ext.file_offset); - - record.dep_count = H_GET_32 (abfd, record_ext.dep_count); - record.depee_count = H_GET_32 (abfd, record_ext.depee_count); - record.sect_count = H_GET_32 (abfd, record_ext.sect_count); - - module[i].name = bfd_alloc (abfd, (bfd_size_type) 33); - if (!module[i].name) - return NULL; - - memcpy (module[i].name, record_ext.mod_name, 33); - filepos += - sizeof (record_ext) + - record.dep_count * 4 + - record.depee_count * 4 + - record.sect_count * 8 + 187; - } - else + /* There are two ways of specifying the archive header. */ { oasys_extmodule_table_type_b_type record_ext; amt = sizeof (record_ext); - if (bfd_bread ((PTR) &record_ext, amt, abfd) != amt) + if (bfd_bread ((void *) &record_ext, amt, abfd) != amt) return NULL; record.mod_size = H_GET_32 (abfd, record_ext.mod_size); @@ -412,7 +295,7 @@ oasys_archive_p (abfd) module[i].name = bfd_alloc (abfd, amt + 1); if (!module[i].name) return NULL; - if (bfd_bread ((PTR) module[i].name, amt, abfd) != amt) + if (bfd_bread ((void *) module[i].name, amt, abfd) != amt) return NULL; module[i].name[record.module_name_size] = 0; filepos += (sizeof (record_ext) @@ -429,188 +312,31 @@ oasys_archive_p (abfd) } static bfd_boolean -oasys_mkobject (abfd) - bfd *abfd; +oasys_mkobject (bfd *abfd) { bfd_size_type amt = sizeof (oasys_data_type); - abfd->tdata.oasys_obj_data = (oasys_data_type *) bfd_alloc (abfd, amt); - return abfd->tdata.oasys_obj_data != NULL; -} - -#define MAX_SECS 16 -static const bfd_target * -oasys_object_p (abfd) - bfd *abfd; -{ - oasys_data_type *oasys; - oasys_data_type *save = OASYS_DATA (abfd); - bfd_boolean loop = TRUE; - bfd_boolean had_usefull = FALSE; - - abfd->tdata.oasys_obj_data = 0; - oasys_mkobject (abfd); - oasys = OASYS_DATA (abfd); - memset ((PTR) oasys->sections, 0xff, sizeof (oasys->sections)); - - /* Point to the start of the file */ - if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) - goto fail; - oasys->symbol_string_length = 0; - /* Inspect the records, but only keep the section info - - remember the size of the symbols - */ - oasys->first_data_record = 0; - while (loop) - { - oasys_record_union_type record; - if (! oasys_read_record (abfd, &record)) - goto fail; - if ((size_t) record.header.length < (size_t) sizeof (record.header)) - goto fail; + abfd->tdata.oasys_obj_data = bfd_alloc (abfd, amt); - switch ((oasys_record_enum_type) (record.header.type)) - { - case oasys_record_is_header_enum: - had_usefull = TRUE; - break; - case oasys_record_is_symbol_enum: - case oasys_record_is_local_enum: - /* Count symbols and remember their size for a future malloc */ - abfd->symcount++; - oasys->symbol_string_length += 1 + oasys_string_length (&record); - had_usefull = TRUE; - break; - case oasys_record_is_section_enum: - { - asection *s; - char *buffer; - unsigned int section_number; - if (record.section.header.length != sizeof (record.section)) - { - goto fail; - } - buffer = bfd_alloc (abfd, (bfd_size_type) 3); - if (!buffer) - goto fail; - section_number = record.section.relb & RELOCATION_SECT_BITS; - sprintf (buffer, "%u", section_number); - s = bfd_make_section (abfd, buffer); - oasys->sections[section_number] = s; - switch (record.section.relb & RELOCATION_TYPE_BITS) - { - case RELOCATION_TYPE_ABS: - case RELOCATION_TYPE_REL: - break; - case RELOCATION_TYPE_UND: - case RELOCATION_TYPE_COM: - BFD_FAIL (); - } - - s->_raw_size = H_GET_32 (abfd, record.section.value); - s->vma = H_GET_32 (abfd, record.section.vma); - s->flags = 0; - had_usefull = TRUE; - } - break; - case oasys_record_is_data_enum: - oasys->first_data_record = bfd_tell (abfd) - record.header.length; - case oasys_record_is_debug_enum: - case oasys_record_is_module_enum: - case oasys_record_is_named_section_enum: - case oasys_record_is_end_enum: - if (! had_usefull) - goto fail; - loop = FALSE; - break; - default: - goto fail; - } - } - oasys->symbols = (asymbol *) NULL; - /* - Oasys support several architectures, but I can't see a simple way - to discover which one is in a particular file - we'll guess - */ - bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0); - if (abfd->symcount != 0) - { - abfd->flags |= HAS_SYMS; - } - - /* - We don't know if a section has data until we've read it.. - */ - - oasys_slurp_section_data (abfd); - - - return abfd->xvec; - -fail: - (void) bfd_release (abfd, oasys); - abfd->tdata.oasys_obj_data = save; - return (const bfd_target *) NULL; -} - - -static void -oasys_get_symbol_info (ignore_abfd, symbol, ret) - bfd *ignore_abfd ATTRIBUTE_UNUSED; - asymbol *symbol; - symbol_info *ret; -{ - bfd_symbol_info (symbol, ret); - if (!symbol->section) - ret->type = (symbol->flags & BSF_LOCAL) ? 'a' : 'A'; + return abfd->tdata.oasys_obj_data != NULL; } -static void -oasys_print_symbol (abfd, afile, symbol, how) - bfd *abfd; - PTR afile; - asymbol *symbol; - bfd_print_symbol_type how; -{ - FILE *file = (FILE *) afile; - - switch (how) - { - case bfd_print_symbol_name: - case bfd_print_symbol_more: - fprintf (file, "%s", symbol->name); - break; - case bfd_print_symbol_all: - { - const char *section_name = symbol->section == (asection *) NULL ? - (const char *) "*abs" : symbol->section->name; - - bfd_print_symbol_vandf (abfd, (PTR) file, symbol); +/* The howto table is build using the top two bits of a reloc byte to + index into it. The bits are PCREL,WORD/LONG. */ - fprintf (file, " %-5s %s", - section_name, - symbol->name); - } - break; - } -} -/* - The howto table is build using the top two bits of a reloc byte to - index into it. The bits are PCREL,WORD/LONG -*/ static reloc_howto_type howto_table[] = { - HOWTO (0, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, 0, "abs16", TRUE, 0x0000ffff, 0x0000ffff, FALSE), - HOWTO (0, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, 0, "abs32", TRUE, 0xffffffff, 0xffffffff, FALSE), - HOWTO (0, 0, 1, 16, TRUE, 0, complain_overflow_signed, 0, "pcrel16", TRUE, 0x0000ffff, 0x0000ffff, FALSE), - HOWTO (0, 0, 2, 32, TRUE, 0, complain_overflow_signed, 0, "pcrel32", TRUE, 0xffffffff, 0xffffffff, FALSE) + HOWTO (0, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, 0, "abs16", TRUE, 0x0000ffff, 0x0000ffff, FALSE), + HOWTO (0, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, 0, "abs32", TRUE, 0xffffffff, 0xffffffff, FALSE), + HOWTO (0, 0, 1, 16, TRUE, 0, complain_overflow_signed, 0, "pcrel16", TRUE, 0x0000ffff, 0x0000ffff, FALSE), + HOWTO (0, 0, 2, 32, TRUE, 0, complain_overflow_signed, 0, "pcrel32", TRUE, 0xffffffff, 0xffffffff, FALSE) }; -/* Read in all the section data and relocation stuff too */ +/* Read in all the section data and relocation stuff too. */ + static bfd_boolean -oasys_slurp_section_data (abfd) - bfd *const abfd; +oasys_slurp_section_data (bfd *const abfd) { oasys_record_union_type record; oasys_data_type *data = OASYS_DATA (abfd); @@ -619,8 +345,8 @@ oasys_slurp_section_data (abfd) asection *s; bfd_size_type amt; - /* See if the data has been slurped already .. */ - for (s = abfd->sections; s != (asection *) NULL; s = s->next) + /* See if the data has been slurped already. */ + for (s = abfd->sections; s != NULL; s = s->next) { per = oasys_per_section (s); if (per->initialized) @@ -632,17 +358,18 @@ oasys_slurp_section_data (abfd) if (bfd_seek (abfd, data->first_data_record, SEEK_SET) != 0) return FALSE; + while (loop) { if (! oasys_read_record (abfd, &record)) return FALSE; + switch (record.header.type) { case oasys_record_is_header_enum: break; case oasys_record_is_data_enum: { - bfd_byte *src = record.data.data; bfd_byte *end_src = ((bfd_byte *) & record) + record.header.length; bfd_byte *dst_ptr; @@ -657,11 +384,13 @@ oasys_slurp_section_data (abfd) if (! per->initialized) { - per->data = (bfd_byte *) bfd_zalloc (abfd, section->_raw_size); + arelent **relpp; + + per->data = bfd_zalloc (abfd, section->size); if (!per->data) return FALSE; - per->reloc_tail_ptr - = (oasys_reloc_type **) §ion->relocation; + relpp = §ion->relocation; + per->reloc_tail_ptr = (oasys_reloc_type **) relpp; per->had_vma = FALSE; per->initialized = TRUE; section->reloc_count = 0; @@ -671,7 +400,7 @@ oasys_slurp_section_data (abfd) dst_offset = H_GET_32 (abfd, record.data.addr); if (! per->had_vma) { - /* Take the first vma we see as the base */ + /* Take the first vma we see as the base. */ section->vma = dst_offset; per->had_vma = TRUE; } @@ -683,9 +412,8 @@ oasys_slurp_section_data (abfd) dst_offset; if (src < end_src) - { - section->flags |= SEC_LOAD | SEC_HAS_CONTENTS; - } + section->flags |= SEC_LOAD | SEC_HAS_CONTENTS; + while (src < end_src) { unsigned char mod_byte = *src++; @@ -712,43 +440,33 @@ oasys_slurp_section_data (abfd) if (relbit & mod_byte) { unsigned char reloc = *src; - /* This item needs to be relocated */ + /* This item needs to be relocated. */ switch (reloc & RELOCATION_TYPE_BITS) { case RELOCATION_TYPE_ABS: - break; case RELOCATION_TYPE_REL: { - /* Relocate the item relative to the section */ + /* Relocate the item relative to the section. */ oasys_reloc_type *r; amt = sizeof (oasys_reloc_type); - r = (oasys_reloc_type *) bfd_alloc (abfd, - amt); + r = bfd_alloc (abfd, amt); if (!r) return FALSE; *(per->reloc_tail_ptr) = r; per->reloc_tail_ptr = &r->next; - r->next = (oasys_reloc_type *) NULL; - /* Reference to undefined symbol */ + r->next = NULL; + /* Reference to undefined symbol. */ src++; - /* There is no symbol */ + /* There is no symbol. */ r->symbol = 0; - /* Work out the howto */ + /* Work out the howto. */ abort (); -#if 0 - r->relent.section = - data->sections[reloc & - RELOCATION_SECT_BITS]; - - r->relent.addend = - - r->relent.section->vma; -#endif r->relent.address = dst_ptr - dst_base_ptr; r->relent.howto = &howto_table[reloc >> 6]; - r->relent.sym_ptr_ptr = (asymbol **) NULL; + r->relent.sym_ptr_ptr = NULL; section->reloc_count++; /* Fake up the data to look like @@ -761,34 +479,28 @@ oasys_slurp_section_data (abfd) } break; - case RELOCATION_TYPE_UND: { oasys_reloc_type *r; amt = sizeof (oasys_reloc_type); - r = (oasys_reloc_type *) bfd_alloc (abfd, - amt); + r = bfd_alloc (abfd, amt); if (!r) return FALSE; *(per->reloc_tail_ptr) = r; per->reloc_tail_ptr = &r->next; - r->next = (oasys_reloc_type *) NULL; - /* Reference to undefined symbol */ + r->next = NULL; + /* Reference to undefined symbol. */ src++; - /* Get symbol number */ + /* Get symbol number. */ r->symbol = (src[0] << 8) | src[1]; - /* Work out the howto */ + /* Work out the howto. */ abort (); -#if 0 - r->relent.section = (asection - *) NULL; -#endif r->relent.addend = 0; r->relent.address = dst_ptr - dst_base_ptr; r->relent.howto = &howto_table[reloc >> 6]; - r->relent.sym_ptr_ptr = (asymbol **) NULL; + r->relent.sym_ptr_ptr = NULL; section->reloc_count++; src += 2; @@ -824,32 +536,177 @@ oasys_slurp_section_data (abfd) } +#define MAX_SECS 16 + +static const bfd_target * +oasys_object_p (bfd *abfd) +{ + oasys_data_type *oasys; + oasys_data_type *save = OASYS_DATA (abfd); + bfd_boolean loop = TRUE; + bfd_boolean had_usefull = FALSE; + + abfd->tdata.oasys_obj_data = 0; + oasys_mkobject (abfd); + oasys = OASYS_DATA (abfd); + memset ((void *) oasys->sections, 0xff, sizeof (oasys->sections)); + + /* Point to the start of the file. */ + if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) + goto fail; + oasys->symbol_string_length = 0; + + /* Inspect the records, but only keep the section info - + remember the size of the symbols. */ + oasys->first_data_record = 0; + while (loop) + { + oasys_record_union_type record; + if (! oasys_read_record (abfd, &record)) + goto fail; + if ((size_t) record.header.length < (size_t) sizeof (record.header)) + goto fail; + + switch ((oasys_record_enum_type) (record.header.type)) + { + case oasys_record_is_header_enum: + had_usefull = TRUE; + break; + case oasys_record_is_symbol_enum: + case oasys_record_is_local_enum: + /* Count symbols and remember their size for a future malloc. */ + abfd->symcount++; + oasys->symbol_string_length += 1 + oasys_string_length (&record); + had_usefull = TRUE; + break; + case oasys_record_is_section_enum: + { + asection *s; + char *buffer; + unsigned int section_number; + + if (record.section.header.length != sizeof (record.section)) + goto fail; + + buffer = bfd_alloc (abfd, (bfd_size_type) 3); + if (!buffer) + goto fail; + section_number = record.section.relb & RELOCATION_SECT_BITS; + sprintf (buffer, "%u", section_number); + s = bfd_make_section (abfd, buffer); + oasys->sections[section_number] = s; + switch (record.section.relb & RELOCATION_TYPE_BITS) + { + case RELOCATION_TYPE_ABS: + case RELOCATION_TYPE_REL: + break; + case RELOCATION_TYPE_UND: + case RELOCATION_TYPE_COM: + BFD_FAIL (); + } + + s->size = H_GET_32 (abfd, record.section.value); + s->vma = H_GET_32 (abfd, record.section.vma); + s->flags = 0; + had_usefull = TRUE; + } + break; + case oasys_record_is_data_enum: + oasys->first_data_record = bfd_tell (abfd) - record.header.length; + case oasys_record_is_debug_enum: + case oasys_record_is_module_enum: + case oasys_record_is_named_section_enum: + case oasys_record_is_end_enum: + if (! had_usefull) + goto fail; + loop = FALSE; + break; + default: + goto fail; + } + } + oasys->symbols = NULL; + + /* Oasys support several architectures, but I can't see a simple way + to discover which one is in a particular file - we'll guess. */ + bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0); + if (abfd->symcount != 0) + abfd->flags |= HAS_SYMS; + + /* We don't know if a section has data until we've read it. */ + oasys_slurp_section_data (abfd); + + return abfd->xvec; + +fail: + (void) bfd_release (abfd, oasys); + abfd->tdata.oasys_obj_data = save; + return NULL; +} + + +static void +oasys_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED, + asymbol *symbol, + symbol_info *ret) +{ + bfd_symbol_info (symbol, ret); + + if (!symbol->section) + ret->type = (symbol->flags & BSF_LOCAL) ? 'a' : 'A'; +} + +static void +oasys_print_symbol (bfd *abfd, void * afile, asymbol *symbol, bfd_print_symbol_type how) +{ + FILE *file = (FILE *) afile; + + switch (how) + { + case bfd_print_symbol_name: + case bfd_print_symbol_more: + fprintf (file, "%s", symbol->name); + break; + case bfd_print_symbol_all: + { + const char *section_name = symbol->section == NULL ? + (const char *) "*abs" : symbol->section->name; + + bfd_print_symbol_vandf (abfd, (void *) file, symbol); + + fprintf (file, " %-5s %s", + section_name, + symbol->name); + } + break; + } +} + static bfd_boolean -oasys_new_section_hook (abfd, newsect) - bfd *abfd; - asection *newsect; +oasys_new_section_hook (bfd *abfd, asection *newsect) { - newsect->used_by_bfd = (PTR) - bfd_alloc (abfd, (bfd_size_type) sizeof (oasys_per_section_type)); if (!newsect->used_by_bfd) - return FALSE; - oasys_per_section (newsect)->data = (bfd_byte *) NULL; + { + newsect->used_by_bfd + = bfd_alloc (abfd, (bfd_size_type) sizeof (oasys_per_section_type)); + if (!newsect->used_by_bfd) + return FALSE; + } + oasys_per_section (newsect)->data = NULL; oasys_per_section (newsect)->section = newsect; oasys_per_section (newsect)->offset = 0; oasys_per_section (newsect)->initialized = FALSE; newsect->alignment_power = 1; - /* Turn the section string into an index */ + /* Turn the section string into an index. */ sscanf (newsect->name, "%u", &newsect->target_index); - return TRUE; + return _bfd_generic_new_section_hook (abfd, newsect); } static long -oasys_get_reloc_upper_bound (abfd, asect) - bfd *abfd; - sec_ptr asect; +oasys_get_reloc_upper_bound (bfd *abfd, sec_ptr asect) { if (! oasys_slurp_section_data (abfd)) return -1; @@ -857,68 +714,50 @@ oasys_get_reloc_upper_bound (abfd, asect) } static bfd_boolean -oasys_get_section_contents (abfd, section, location, offset, count) - bfd *abfd; - sec_ptr section; - PTR location; - file_ptr offset; - bfd_size_type count; +oasys_get_section_contents (bfd *abfd, + sec_ptr section, + void * location, + file_ptr offset, + bfd_size_type count) { oasys_per_section_type *p = oasys_per_section (section); + oasys_slurp_section_data (abfd); + if (! p->initialized) - { - (void) memset (location, 0, (size_t) count); - } + (void) memset (location, 0, (size_t) count); else - { - (void) memcpy (location, (PTR) (p->data + offset), (size_t) count); - } + (void) memcpy (location, (void *) (p->data + offset), (size_t) count); + return TRUE; } - -long -oasys_canonicalize_reloc (ignore_abfd, section, relptr, symbols) - bfd *ignore_abfd ATTRIBUTE_UNUSED; - sec_ptr section; - arelent **relptr; - asymbol **symbols ATTRIBUTE_UNUSED; +static long +oasys_canonicalize_reloc (bfd *ignore_abfd ATTRIBUTE_UNUSED, + sec_ptr section, + arelent **relptr, + asymbol **symbols ATTRIBUTE_UNUSED) { unsigned int reloc_count = 0; oasys_reloc_type *src = (oasys_reloc_type *) (section->relocation); - while (src != (oasys_reloc_type *) NULL) - { - abort (); -#if 0 - if (src->relent.section == (asection *) NULL) - { - src->relent.sym_ptr_ptr = symbols + src->symbol; - } -#endif + if (src != NULL) + abort (); - *relptr++ = &src->relent; - src = src->next; - reloc_count++; - } - *relptr = (arelent *) NULL; + *relptr = NULL; return section->reloc_count = reloc_count; } +/* Writing. */ +/* Calculate the checksum and write one record. */ -/* Writing */ - - -/* Calculate the checksum and write one record */ static bfd_boolean -oasys_write_record (abfd, type, record, size) - bfd *abfd; - oasys_record_enum_type type; - oasys_record_union_type *record; - size_t size; +oasys_write_record (bfd *abfd, + oasys_record_enum_type type, + oasys_record_union_type *record, + size_t size) { int checksum; size_t i; @@ -931,30 +770,27 @@ oasys_write_record (abfd, type, record, size) ptr = (unsigned char *) &record->pad[0]; checksum = 0; for (i = 0; i < size; i++) - { - checksum += *ptr++; - } + checksum += *ptr++; record->header.check_sum = 0xff & (-checksum); - if (bfd_bwrite ((PTR) record, (bfd_size_type) size, abfd) != size) + if (bfd_bwrite ((void *) record, (bfd_size_type) size, abfd) != size) return FALSE; return TRUE; } -/* Write out all the symbols */ +/* Write out all the symbols. */ + static bfd_boolean -oasys_write_syms (abfd) - bfd *abfd; +oasys_write_syms (bfd *abfd) { unsigned int count; asymbol **generic = bfd_get_outsymbols (abfd); unsigned int index = 0; + for (count = 0; count < bfd_get_symcount (abfd); count++) { - oasys_symbol_record_type symbol; asymbol *const g = generic[count]; - const char *src = g->name; char *dst = symbol.name; unsigned int l = 0; @@ -969,7 +805,6 @@ oasys_write_syms (abfd) { symbol.relb = RELOCATION_TYPE_ABS; H_PUT_16 (abfd, 0, symbol.refno); - } else if (bfd_is_und_section (g->section)) { @@ -979,25 +814,20 @@ oasys_write_syms (abfd) index++; } else if (g->flags & BSF_DEBUGGING) - { - /* throw it away */ - continue; - } + /* Throw it away. */ + continue; else { - if (g->section == (asection *) NULL) - { - /* Sometime, the oasys tools give out a symbol with illegal - bits in it, we'll output it in the same broken way */ - - symbol.relb = RELOCATION_TYPE_REL | 0; - } + if (g->section == NULL) + /* Sometime, the oasys tools give out a symbol with illegal + bits in it, we'll output it in the same broken way. */ + symbol.relb = RELOCATION_TYPE_REL | 0; else - { - symbol.relb = RELOCATION_TYPE_REL | g->section->output_section->target_index; - } + symbol.relb = RELOCATION_TYPE_REL | g->section->output_section->target_index; + H_PUT_16 (abfd, 0, symbol.refno); } + #ifdef UNDERSCORE_HACK if (src[l] == '_') dst[l++] = '.'; @@ -1010,7 +840,6 @@ oasys_write_syms (abfd) H_PUT_32 (abfd, g->value, symbol.value); - if (g->flags & BSF_LOCAL) { if (! oasys_write_record (abfd, @@ -1035,16 +864,15 @@ oasys_write_syms (abfd) return TRUE; } +/* Write a section header for each section. */ - /* Write a section header for each section */ static bfd_boolean -oasys_write_sections (abfd) - bfd *abfd; +oasys_write_sections (bfd *abfd) { asection *s; static oasys_section_record_type out; - for (s = abfd->sections; s != (asection *) NULL; s = s->next) + for (s = abfd->sections; s != NULL; s = s->next) { if (!ISDIGIT (s->name[0])) { @@ -1055,7 +883,7 @@ oasys_write_sections (abfd) return FALSE; } out.relb = RELOCATION_TYPE_REL | s->target_index; - H_PUT_32 (abfd, s->_cooked_size, out.value); + H_PUT_32 (abfd, s->size, out.value); H_PUT_32 (abfd, s->vma, out.vma); if (! oasys_write_record (abfd, @@ -1068,42 +896,33 @@ oasys_write_sections (abfd) } static bfd_boolean -oasys_write_header (abfd) - bfd *abfd; +oasys_write_header (bfd *abfd) { - /* Create and write the header */ + /* Create and write the header. */ oasys_header_record_type r; size_t length = strlen (abfd->filename); + if (length > (size_t) sizeof (r.module_name)) - { - length = sizeof (r.module_name); - } + length = sizeof (r.module_name); - (void) memcpy (r.module_name, - abfd->filename, - length); - (void) memset (r.module_name + length, - ' ', - sizeof (r.module_name) - length); + (void) memcpy (r.module_name, abfd->filename, length); + (void) memset (r.module_name + length, ' ', sizeof (r.module_name) - length); r.version_number = OASYS_VERSION_NUMBER; r.rev_number = OASYS_REV_NUMBER; - if (! oasys_write_record (abfd, - oasys_record_is_header_enum, - (oasys_record_union_type *) & r, - offsetof (oasys_header_record_type, - description[0]))) - return FALSE; - return TRUE; + return oasys_write_record (abfd, oasys_record_is_header_enum, + (oasys_record_union_type *) & r, + offsetof (oasys_header_record_type, + description[0])); } static bfd_boolean -oasys_write_end (abfd) - bfd *abfd; +oasys_write_end (bfd *abfd) { oasys_end_record_type end; unsigned char null = 0; + end.relb = RELOCATION_TYPE_ABS; H_PUT_32 (abfd, abfd->start_address, end.entry); H_PUT_16 (abfd, 0, end.fill); @@ -1113,31 +932,25 @@ oasys_write_end (abfd) (oasys_record_union_type *) & end, sizeof (end))) return FALSE; - if (bfd_bwrite ((PTR) &null, (bfd_size_type) 1, abfd) != 1) - return FALSE; - return TRUE; + + return bfd_bwrite ((void *) &null, (bfd_size_type) 1, abfd) == 1; } static int -comp (ap, bp) - const PTR ap; - const PTR bp; +comp (const void * ap, const void * bp) { arelent *a = *((arelent **) ap); arelent *b = *((arelent **) bp); + return a->address - b->address; } -/* - Writing data.. - -*/ static bfd_boolean -oasys_write_data (abfd) - bfd *abfd; +oasys_write_data (bfd *abfd) { asection *s; - for (s = abfd->sections; s != (asection *) NULL; s = s->next) + + for (s = abfd->sections; s != NULL; s = s->next) { if (s->flags & SEC_LOAD) { @@ -1146,164 +959,65 @@ oasys_write_data (abfd) bfd_size_type current_byte_index = 0; unsigned int relocs_to_go = s->reloc_count; arelent **p = s->orelocation; + if (s->reloc_count != 0) - { -/* Sort the reloc records so it's easy to insert the relocs into the - data */ + /* Sort the reloc records so it's easy to insert the relocs into the + data. */ + qsort (s->orelocation, s->reloc_count, sizeof (arelent **), comp); - qsort (s->orelocation, - s->reloc_count, - sizeof (arelent **), - comp); - } current_byte_index = 0; processed_data.relb = s->target_index | RELOCATION_TYPE_REL; - while (current_byte_index < s->_cooked_size) + while (current_byte_index < s->size) { /* Scan forwards by eight bytes or however much is left and see if - there are any relocations going on */ + there are any relocations going on. */ bfd_byte *mod = &processed_data.data[0]; bfd_byte *dst = &processed_data.data[1]; unsigned int i = 0; *mod = 0; - H_PUT_32 (abfd, s->vma + current_byte_index, processed_data.addr); /* Don't start a relocation unless you're sure you can finish it - within the same data record. The worst case relocation is a - 4-byte relocatable value which is split across two modification - bytes (1 relocation byte + 2 symbol reference bytes + 2 data + - 1 modification byte + 2 data = 8 bytes total). That's where - the magic number 8 comes from. - */ - while (current_byte_index < s->_raw_size && dst <= - &processed_data.data[sizeof (processed_data.data) - 8]) + within the same data record. The worst case relocation is a + 4-byte relocatable value which is split across two modification + bytes (1 relocation byte + 2 symbol reference bytes + 2 data + + 1 modification byte + 2 data = 8 bytes total). That's where + the magic number 8 comes from. */ + while (current_byte_index < s->size && dst <= + & processed_data.data[sizeof (processed_data.data) - 8]) { - - if (relocs_to_go != 0) { arelent *r = *p; - reloc_howto_type *const how = r->howto; - /* There is a relocation, is it for this byte ? */ - if (r->address == current_byte_index) - { - unsigned char rel_byte; - - p++; - relocs_to_go--; - - *mod |= (1 << i); - if (how->pc_relative) - { - rel_byte = RELOCATION_PCREL_BIT; - - /* Also patch the raw data so that it doesn't have - the -ve stuff any more */ - if (how->size != 2) - { - bfd_put_16 (abfd, - bfd_get_16 (abfd, raw_data) + - current_byte_index, raw_data); - } - else - { - bfd_put_32 (abfd, - bfd_get_32 (abfd, raw_data) + - current_byte_index, raw_data); - } - } - else - { - rel_byte = 0; - } - if (how->size == 2) - { - rel_byte |= RELOCATION_32BIT_BIT; - } - - /* Is this a section relative relocation, or a symbol - relative relocation ? */ - abort (); - -#if 0 - if (r->section != (asection *) NULL) - { - /* The relent has a section attached, so it must be section - relative */ - rel_byte |= RELOCATION_TYPE_REL; - rel_byte |= r->section->output_section->target_index; - *dst++ = rel_byte; - } - else -#endif - { - asymbol *sym = *(r->sym_ptr_ptr); - - /* If this symbol has a section attached, then it - has already been resolved. Change from a symbol - ref to a section ref */ - if (sym->section != (asection *) NULL) - { - rel_byte |= RELOCATION_TYPE_REL; - rel_byte |= - sym->section->output_section->target_index; - *dst++ = rel_byte; - } - else - { - rel_byte |= RELOCATION_TYPE_UND; - *dst++ = rel_byte; - /* Next two bytes are a symbol index - we can get - this from the symbol value which has been zapped - into the symbol index in the table when the - symbol table was written - */ - *dst++ = sym->value >> 8; - *dst++ = sym->value; - } - } -#define ADVANCE { if (++i >= 8) { i = 0; mod = dst++; *mod = 0; } current_byte_index++; } - /* relocations never occur from an unloadable section, - so we can assume that raw_data is not NULL - */ - *dst++ = *raw_data++; - ADVANCE - * dst++ = *raw_data++; - ADVANCE - if (how->size == 2) - { - *dst++ = *raw_data++; - ADVANCE - * dst++ = *raw_data++; - ADVANCE - } - continue; - } + /* There is a relocation, is it for this byte ? */ + if (r->address == current_byte_index) + abort (); } + /* If this is coming from an unloadable section then copy - zeros */ + zeros. */ if (raw_data == NULL) - { - *dst++ = 0; - } + *dst++ = 0; else + *dst++ = *raw_data++; + + if (++i >= 8) { - *dst++ = *raw_data++; + i = 0; + mod = dst++; + *mod = 0; } - ADVANCE + current_byte_index++; } - /* Don't write a useless null modification byte */ + /* Don't write a useless null modification byte. */ if (dst == mod + 1) - { - --dst; - } + --dst; if (! (oasys_write_record (abfd, oasys_record_is_data_enum, @@ -1318,8 +1032,7 @@ oasys_write_data (abfd) } static bfd_boolean -oasys_write_object_contents (abfd) - bfd *abfd; +oasys_write_object_contents (bfd *abfd) { if (! oasys_write_header (abfd)) return FALSE; @@ -1334,220 +1047,194 @@ oasys_write_object_contents (abfd) return TRUE; } +/* Set section contents is complicated with OASYS since the format is + not a byte image, but a record stream. */ - - -/** exec and core file sections */ - -/* set section contents is complicated with OASYS since the format is -* not a byte image, but a record stream. -*/ static bfd_boolean -oasys_set_section_contents (abfd, section, location, offset, count) - bfd *abfd; - sec_ptr section; - PTR location; - file_ptr offset; - bfd_size_type count; +oasys_set_section_contents (bfd *abfd, + sec_ptr section, + const void * location, + file_ptr offset, + bfd_size_type count) { if (count != 0) { - if (oasys_per_section (section)->data == (bfd_byte *) NULL) + if (oasys_per_section (section)->data == NULL) { - oasys_per_section (section)->data = - (bfd_byte *) (bfd_alloc (abfd, section->_cooked_size)); + oasys_per_section (section)->data = bfd_alloc (abfd, section->size); if (!oasys_per_section (section)->data) return FALSE; } - (void) memcpy ((PTR) (oasys_per_section (section)->data + offset), - location, - (size_t) count); + (void) memcpy ((void *) (oasys_per_section (section)->data + offset), + location, (size_t) count); } return TRUE; } -/* Native-level interface to symbols. */ +/* Native-level interface to symbols. */ /* We read the symbols into a buffer, which is discarded when this -function exits. We read the strings into a buffer large enough to -hold them all plus all the cached symbol entries. */ + function exits. We read the strings into a buffer large enough to + hold them all plus all the cached symbol entries. */ static asymbol * -oasys_make_empty_symbol (abfd) - bfd *abfd; +oasys_make_empty_symbol (bfd *abfd) { bfd_size_type amt = sizeof (oasys_symbol_type); - oasys_symbol_type *new = (oasys_symbol_type *) bfd_zalloc (abfd, amt); + oasys_symbol_type *new = bfd_zalloc (abfd, amt); + if (!new) return NULL; new->symbol.the_bfd = abfd; return &new->symbol; } - - - /* User should have checked the file flags; perhaps we should return -BFD_NO_MORE_SYMBOLS if there are none? */ + BFD_NO_MORE_SYMBOLS if there are none? */ static bfd * -oasys_openr_next_archived_file (arch, prev) - bfd *arch; - bfd *prev; +oasys_openr_next_archived_file (bfd *arch, bfd *prev) { oasys_ar_data_type *ar = OASYS_AR_DATA (arch); oasys_module_info_type *p; - /* take the next one from the arch state, or reset */ - if (prev == (bfd *) NULL) - { - /* Reset the index - the first two entries are bogus*/ - ar->module_index = 0; - } + + /* Take the next one from the arch state, or reset. */ + if (prev == NULL) + /* Reset the index - the first two entries are bogus. */ + ar->module_index = 0; p = ar->module + ar->module_index; ar->module_index++; if (ar->module_index <= ar->module_count) { - if (p->abfd == (bfd *) NULL) + if (p->abfd == NULL) { p->abfd = _bfd_create_empty_archive_element_shell (arch); p->abfd->origin = p->pos; p->abfd->filename = p->name; - /* Fixup a pointer to this element for the member */ - p->abfd->arelt_data = (PTR) p; + /* Fixup a pointer to this element for the member. */ + p->abfd->arelt_data = (void *) p; } return p->abfd; } - else - { - bfd_set_error (bfd_error_no_more_archived_files); - return (bfd *) NULL; - } + + bfd_set_error (bfd_error_no_more_archived_files); + return NULL; } static bfd_boolean -oasys_find_nearest_line (abfd, section, symbols, offset, - filename_ptr, functionname_ptr, line_ptr) - bfd *abfd ATTRIBUTE_UNUSED; - asection *section ATTRIBUTE_UNUSED; - asymbol **symbols ATTRIBUTE_UNUSED; - bfd_vma offset ATTRIBUTE_UNUSED; - const char **filename_ptr ATTRIBUTE_UNUSED; - const char **functionname_ptr ATTRIBUTE_UNUSED; - unsigned int *line_ptr ATTRIBUTE_UNUSED; +oasys_find_nearest_line (bfd *abfd ATTRIBUTE_UNUSED, + asection *section ATTRIBUTE_UNUSED, + asymbol **symbols ATTRIBUTE_UNUSED, + bfd_vma offset ATTRIBUTE_UNUSED, + const char **filename_ptr ATTRIBUTE_UNUSED, + const char **functionname_ptr ATTRIBUTE_UNUSED, + unsigned int *line_ptr ATTRIBUTE_UNUSED) { return FALSE; +} +static bfd_boolean +oasys_find_inliner_info (bfd *abfd ATTRIBUTE_UNUSED, + const char **filename_ptr ATTRIBUTE_UNUSED, + const char **functionname_ptr ATTRIBUTE_UNUSED, + unsigned int *line_ptr ATTRIBUTE_UNUSED) +{ + return FALSE; } static int -oasys_generic_stat_arch_elt (abfd, buf) - bfd *abfd; - struct stat *buf; +oasys_generic_stat_arch_elt (bfd *abfd, struct stat *buf) { oasys_module_info_type *mod = (oasys_module_info_type *) abfd->arelt_data; - if (mod == (oasys_module_info_type *) NULL) + + if (mod == NULL) { bfd_set_error (bfd_error_invalid_operation); return -1; } - else - { - buf->st_size = mod->size; - buf->st_mode = 0666; - return 0; - } + + buf->st_size = mod->size; + buf->st_mode = 0666; + return 0; } static int -oasys_sizeof_headers (abfd, exec) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_boolean exec ATTRIBUTE_UNUSED; +oasys_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, bfd_boolean exec ATTRIBUTE_UNUSED) { return 0; } -#define oasys_close_and_cleanup _bfd_generic_close_and_cleanup -#define oasys_bfd_free_cached_info _bfd_generic_bfd_free_cached_info - -#define oasys_slurp_armap bfd_true -#define oasys_slurp_extended_name_table bfd_true -#define oasys_construct_extended_name_table \ - ((bfd_boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \ - bfd_true) -#define oasys_truncate_arname bfd_dont_truncate_arname -#define oasys_write_armap \ - ((bfd_boolean (*) \ - PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int))) \ - bfd_true) -#define oasys_read_ar_hdr bfd_nullvoidptr -#define oasys_get_elt_at_index _bfd_generic_get_elt_at_index -#define oasys_update_armap_timestamp bfd_true - -#define oasys_bfd_is_local_label_name bfd_generic_is_local_label_name -#define oasys_get_lineno _bfd_nosymbols_get_lineno -#define oasys_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol -#define oasys_read_minisymbols _bfd_generic_read_minisymbols -#define oasys_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol - -#define oasys_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup - -#define oasys_set_arch_mach bfd_default_set_arch_mach - -#define oasys_get_section_contents_in_window \ - _bfd_generic_get_section_contents_in_window - -#define oasys_bfd_get_relocated_section_contents \ - bfd_generic_get_relocated_section_contents -#define oasys_bfd_relax_section bfd_generic_relax_section -#define oasys_bfd_gc_sections bfd_generic_gc_sections -#define oasys_bfd_merge_sections bfd_generic_merge_sections -#define oasys_bfd_discard_group bfd_generic_discard_group -#define oasys_bfd_link_hash_table_create _bfd_generic_link_hash_table_create -#define oasys_bfd_link_hash_table_free _bfd_generic_link_hash_table_free -#define oasys_bfd_link_add_symbols _bfd_generic_link_add_symbols -#define oasys_bfd_link_just_syms _bfd_generic_link_just_syms -#define oasys_bfd_final_link _bfd_generic_final_link -#define oasys_bfd_link_split_section _bfd_generic_link_split_section - -/*SUPPRESS 460 */ +#define oasys_close_and_cleanup _bfd_generic_close_and_cleanup +#define oasys_bfd_free_cached_info _bfd_generic_bfd_free_cached_info +#define oasys_slurp_armap bfd_true +#define oasys_slurp_extended_name_table bfd_true +#define oasys_construct_extended_name_table ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_true) +#define oasys_truncate_arname bfd_dont_truncate_arname +#define oasys_write_armap ((bfd_boolean (*) (bfd *, unsigned int, struct orl *, unsigned int, int)) bfd_true) +#define oasys_read_ar_hdr bfd_nullvoidptr +#define oasys_get_elt_at_index _bfd_generic_get_elt_at_index +#define oasys_update_armap_timestamp bfd_true +#define oasys_bfd_is_local_label_name bfd_generic_is_local_label_name +#define oasys_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false) +#define oasys_get_lineno _bfd_nosymbols_get_lineno +#define oasys_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol +#define oasys_read_minisymbols _bfd_generic_read_minisymbols +#define oasys_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol +#define oasys_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup +#define oasys_set_arch_mach bfd_default_set_arch_mach +#define oasys_get_section_contents_in_window _bfd_generic_get_section_contents_in_window +#define oasys_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents +#define oasys_bfd_relax_section bfd_generic_relax_section +#define oasys_bfd_gc_sections bfd_generic_gc_sections +#define oasys_bfd_merge_sections bfd_generic_merge_sections +#define oasys_bfd_is_group_section bfd_generic_is_group_section +#define oasys_bfd_discard_group bfd_generic_discard_group +#define oasys_section_already_linked _bfd_generic_section_already_linked +#define oasys_bfd_link_hash_table_create _bfd_generic_link_hash_table_create +#define oasys_bfd_link_hash_table_free _bfd_generic_link_hash_table_free +#define oasys_bfd_link_add_symbols _bfd_generic_link_add_symbols +#define oasys_bfd_link_just_syms _bfd_generic_link_just_syms +#define oasys_bfd_final_link _bfd_generic_final_link +#define oasys_bfd_link_split_section _bfd_generic_link_split_section + const bfd_target oasys_vec = { - "oasys", /* name */ + "oasys", /* Name. */ bfd_target_oasys_flavour, - BFD_ENDIAN_BIG, /* target byte order */ - BFD_ENDIAN_BIG, /* target headers byte order */ - (HAS_RELOC | EXEC_P | /* object flags */ + BFD_ENDIAN_BIG, /* Target byte order. */ + BFD_ENDIAN_BIG, /* Target headers byte order. */ + (HAS_RELOC | EXEC_P | /* Object flags. */ HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED), (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS - | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ - 0, /* leading underscore */ - ' ', /* ar_pad_char */ - 16, /* ar_max_namelen */ + | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* Section flags. */ + 0, /* Leading underscore. */ + ' ', /* AR_pad_char. */ + 16, /* AR_max_namelen. */ bfd_getb64, bfd_getb_signed_64, bfd_putb64, bfd_getb32, bfd_getb_signed_32, bfd_putb32, - bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */ + bfd_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_getb16, bfd_getb_signed_16, bfd_putb16, /* Headers. */ {_bfd_dummy_target, - oasys_object_p, /* bfd_check_format */ + oasys_object_p, /* bfd_check_format. */ oasys_archive_p, _bfd_dummy_target, }, - { /* bfd_set_format */ + { /* bfd_set_format. */ bfd_false, oasys_mkobject, _bfd_generic_mkarchive, bfd_false }, - { /* bfd_write_contents */ + { /* bfd_write_contents. */ bfd_false, oasys_write_object_contents, _bfd_write_archive_contents, @@ -1566,5 +1253,5 @@ const bfd_target oasys_vec = NULL, - (PTR) 0 + NULL };