X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fversados.c;h=37eb94ceb583729dfb9c316c51edc57dc23ba1a3;hb=3f3c5c340426c1a7d0006cd92f68d394a100d287;hp=9e5bea437a8e77bbaddc8be38f55954a110d8c4f;hpb=fa803dc60f0bf01297674c41d001798e18ade4dc;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/versados.c b/bfd/versados.c index 9e5bea437a..37eb94ceb5 100644 --- a/bfd/versados.c +++ b/bfd/versados.c @@ -1,10 +1,10 @@ /* BFD back-end for VERSAdos-E objects. + Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002 + Free Software Foundation, Inc. + Written by Steve Chamberlain of Cygnus Support . Versados is a Motorola trademark. - Copyright 1995 Free Software Foundation, Inc. - Written by Steve Chamberlain of Cygnus Support . - This file is part of BFD, the Binary File Descriptor library. This program is free software; you can redistribute it and/or modify @@ -37,7 +37,6 @@ o Object Text Recrod o End Record - */ #include "bfd.h" @@ -45,18 +44,34 @@ #include "libbfd.h" #include "libiberty.h" - static boolean versados_mkobject PARAMS ((bfd *)); static boolean versados_scan PARAMS ((bfd *)); static const bfd_target *versados_object_p PARAMS ((bfd *)); - +static asymbol *versados_new_symbol PARAMS ((bfd *, int, const char *, bfd_vma, asection *)); +static char *new_symbol_string PARAMS ((bfd *, const char *)); +static const bfd_target *versados_object_p PARAMS ((bfd *)); +static boolean versados_pass_2 PARAMS ((bfd *)); +static boolean versados_get_section_contents + PARAMS ((bfd *, asection *, void *, file_ptr, bfd_size_type)); +static boolean versados_set_section_contents + PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type)); +static int versados_sizeof_headers PARAMS ((bfd *, boolean)); +static long int versados_get_symtab_upper_bound PARAMS ((bfd *)); +static long int versados_get_symtab PARAMS ((bfd *, asymbol **)); +static void versados_get_symbol_info + PARAMS ((bfd *, asymbol *, symbol_info *)); +static void versados_print_symbol + PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type)); +static long versados_get_reloc_upper_bound + PARAMS ((bfd *, sec_ptr)); +static long versados_canonicalize_reloc + PARAMS ((bfd *, sec_ptr, arelent **, asymbol **)); #define VHEADER '1' #define VESTDEF '2' #define VOTR '3' #define VEND '4' - #define ES_BASE 17 /* first symbol has esdid 17 */ /* Per file target dependent information */ @@ -146,11 +161,14 @@ union ext_any struct ext_otr otr; }; -/* Initialize by filling in the hex conversion array. */ - - - +static int get_record PARAMS ((bfd *, union ext_any *)); +static int get_4 PARAMS ((unsigned char **)); +static void get_10 PARAMS ((unsigned char **, char *)); +static void process_esd PARAMS ((bfd *, struct ext_esd *, int)); +static int get_offset PARAMS ((int, unsigned char *)); +static void process_otr PARAMS ((bfd *, struct ext_otr *, int)); +/* Initialize by filling in the hex conversion array. */ /* Set up the tdata information. */ @@ -160,7 +178,8 @@ versados_mkobject (abfd) { if (abfd->tdata.versados_data == NULL) { - tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type)); + bfd_size_type amt = sizeof (tdata_type); + tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, amt); if (tdata == NULL) return false; abfd->tdata.versados_data = tdata; @@ -172,13 +191,10 @@ versados_mkobject (abfd) return true; } - /* Report a problem in an S record file. FIXME: This probably should not call fprintf, but we really do need some mechanism for printing error messages. */ - - static asymbol * versados_new_symbol (abfd, snum, name, val, sec) bfd *abfd; @@ -196,19 +212,19 @@ versados_new_symbol (abfd, snum, name, val, sec) return n; } - static int get_record (abfd, ptr) bfd *abfd; union ext_any *ptr; { - bfd_read (&ptr->size, 1, 1, abfd); - if (bfd_read ((char *) ptr + 1, 1, ptr->size, abfd) != ptr->size) + if (bfd_bread (&ptr->size, (bfd_size_type) 1, abfd) != 1 + || (bfd_bread ((char *) ptr + 1, (bfd_size_type) ptr->size, abfd) + != ptr->size)) return 0; return 1; } -int +static int get_4 (pp) unsigned char **pp; { @@ -217,7 +233,7 @@ get_4 (pp) return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | (p[3] << 0); } -void +static void get_10 (pp, name) unsigned char **pp; char *name; @@ -237,7 +253,7 @@ get_10 (pp, name) static char * new_symbol_string (abfd, name) bfd *abfd; - char *name; + const char *name; { char *n = VDATA (abfd)->strings; strcpy (VDATA (abfd)->strings, name); @@ -245,7 +261,6 @@ new_symbol_string (abfd, name) return n; } - static void process_esd (abfd, esd, pass) bfd *abfd; @@ -289,15 +304,14 @@ process_esd (abfd, esd, pass) int esidx; asymbol *s; char *n = new_symbol_string (abfd, name); - s = versados_new_symbol (abfd, snum, n, 0, - &bfd_und_section, scn); + s = versados_new_symbol (abfd, snum, n, (bfd_vma) 0, + bfd_und_section_ptr); esidx = VDATA (abfd)->es_done++; RDATA (abfd, esidx - ES_BASE) = s; } } break; - case ESD_ABS: size = get_4 (&ptr); start = get_4 (&ptr); @@ -314,7 +328,7 @@ process_esd (abfd, esd, pass) case ESD_XDEF_IN_SEC: { int snum = VDATA (abfd)->def_idx++; - long val; + bfd_vma val; get_10 (&ptr, name); val = get_4 (&ptr); if (pass == 1) @@ -326,7 +340,8 @@ process_esd (abfd, esd, pass) { asymbol *s; char *n = new_symbol_string (abfd, name); - s = versados_new_symbol (abfd, snum + VDATA (abfd)->nrefs, n, val, sec, scn); + s = versados_new_symbol (abfd, snum + VDATA (abfd)->nrefs, n, + val, sec); s->flags |= BSF_GLOBAL; } } @@ -357,7 +372,6 @@ reloc_howto_type versados_howto_table[] = "-v32", true, 0xffffffff, 0xffffffff, false), }; - static int get_offset (len, ptr) int len; @@ -396,7 +410,7 @@ process_otr (abfd, otr, pass) int need_contents = 0; unsigned int dst_idx = esdid->pc; - for (shift = (1 << 31); shift && srcp < endp; shift >>= 1) + for (shift = ((unsigned long) 1 << 31); shift && srcp < endp; shift >>= 1) { if (bits & shift) { @@ -406,7 +420,6 @@ process_otr (abfd, otr, pass) int offsetlen = flag & 0x7; int j; - if (esdids == 0) { /* A zero esdid means the new pc is the offset given */ @@ -434,7 +447,7 @@ process_otr (abfd, otr, pass) int rn = EDATA (abfd, otr->esdid - 1).relocs++; if (pass == 1) { - /* this is the first pass over the data, + /* this is the first pass over the data, just remember that we need a reloc */ } else @@ -470,9 +483,10 @@ process_otr (abfd, otr, pass) EDATA (abfd, otr->esdid - 1).pc = dst_idx; if (!contents && need_contents) - esdid->contents = (unsigned char *) bfd_alloc (abfd, esdid->section->_raw_size); - - + { + bfd_size_type size = esdid->section->_raw_size; + esdid->contents = (unsigned char *) bfd_alloc (abfd, size); + } } static boolean @@ -483,11 +497,14 @@ versados_scan (abfd) int i; int j; int nsecs = 0; + bfd_size_type amt; + VDATA (abfd)->stringlen = 0; VDATA (abfd)->nrefs = 0; VDATA (abfd)->ndefs = 0; VDATA (abfd)->ref_idx = 0; VDATA (abfd)->def_idx = 0; + VDATA (abfd)->pass_2_done = 0; while (loop) { @@ -524,8 +541,8 @@ versados_scan (abfd) struct esdid *esdid = &EDATA (abfd, i); if (esdid->section) { - esdid->section->relocation - = (arelent *) bfd_alloc (abfd, sizeof (arelent) * esdid->relocs); + amt = (bfd_size_type) esdid->relocs * sizeof (arelent); + esdid->section->relocation = (arelent *) bfd_alloc (abfd, amt); esdid->pc = 0; @@ -546,11 +563,16 @@ versados_scan (abfd) abfd->symcount += nsecs; - VDATA (abfd)->symbols = (asymbol *) bfd_alloc (abfd, - sizeof (asymbol) * (abfd->symcount)); + amt = abfd->symcount; + amt *= sizeof (asymbol); + VDATA (abfd)->symbols = (asymbol *) bfd_alloc (abfd, amt); - VDATA (abfd)->strings = bfd_alloc (abfd, VDATA (abfd)->stringlen); + amt = VDATA (abfd)->stringlen; + VDATA (abfd)->strings = bfd_alloc (abfd, amt); + if ((VDATA (abfd)->symbols == NULL && abfd->symcount > 0) + || (VDATA (abfd)->strings == NULL && VDATA (abfd)->stringlen > 0)) + return false; /* Actually fill in the section symbols, we stick them at the end of the table */ @@ -582,8 +604,6 @@ versados_scan (abfd) return 1; } - - /* Check whether an existing file is a versados file. */ static const bfd_target * @@ -593,20 +613,34 @@ versados_object_p (abfd) struct ext_vheader ext; unsigned char len; - if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET)) + if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) return NULL; + if (bfd_bread (&len, (bfd_size_type) 1, abfd) != 1) + { + if (bfd_get_error () != bfd_error_system_call) + bfd_set_error (bfd_error_wrong_format); + return NULL; + } + + if (bfd_bread (&ext.type, (bfd_size_type) len, abfd) != len) + { + if (bfd_get_error () != bfd_error_system_call) + bfd_set_error (bfd_error_wrong_format); + return NULL; + } - bfd_read (&len, 1, 1, abfd); - if (bfd_read (&ext.type, 1, len, abfd) != len - || ext.type != '1') + /* We guess that the language field will never be larger than 10. + In sample files, it is always either 0 or 1. Checking for this + prevents confusion with Intel Hex files. */ + if (ext.type != VHEADER + || ext.lang > 10) { bfd_set_error (bfd_error_wrong_format); return NULL; } - /* ok, looks like a record, build the tdata and read - in.. */ + /* OK, looks like a record, build the tdata and read in. */ if (!versados_mkobject (abfd) || !versados_scan (abfd)) @@ -615,7 +649,6 @@ versados_object_p (abfd) return abfd->xvec; } - static boolean versados_pass_2 (abfd) bfd *abfd; @@ -625,12 +658,11 @@ versados_pass_2 (abfd) if (VDATA (abfd)->pass_2_done) return 1; - if (bfd_seek (abfd, 0, SEEK_SET) != 0) + if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) return 0; VDATA (abfd)->es_done = ES_BASE; - /* read records till we get to where we want to be */ while (1) @@ -674,35 +706,23 @@ versados_get_section_contents (abfd, section, location, offset, count) static boolean versados_set_section_contents (abfd, section, location, offset, bytes_to_do) - bfd *abfd; - sec_ptr section; - PTR location; - file_ptr offset; - bfd_size_type bytes_to_do; + bfd *abfd ATTRIBUTE_UNUSED; + sec_ptr section ATTRIBUTE_UNUSED; + PTR location ATTRIBUTE_UNUSED; + file_ptr offset ATTRIBUTE_UNUSED; + bfd_size_type bytes_to_do ATTRIBUTE_UNUSED; { return false; } - -/*ARGSUSED */ static int versados_sizeof_headers (abfd, exec) - bfd *abfd; - boolean exec; + bfd *abfd ATTRIBUTE_UNUSED; + boolean exec ATTRIBUTE_UNUSED; { return 0; } -static asymbol * -versados_make_empty_symbol (abfd) - bfd *abfd; -{ - asymbol *new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol)); - if (new) - new->the_bfd = abfd; - return new; -} - /* Return the amount of memory needed to read the symbol table. */ static long @@ -737,20 +757,18 @@ versados_get_symtab (abfd, alocation) return symcount; } -/*ARGSUSED */ -void +static void versados_get_symbol_info (ignore_abfd, symbol, ret) - bfd *ignore_abfd; + bfd *ignore_abfd ATTRIBUTE_UNUSED; asymbol *symbol; symbol_info *ret; { bfd_symbol_info (symbol, ret); } -/*ARGSUSED */ -void -versados_print_symbol (ignore_abfd, afile, symbol, how) - bfd *ignore_abfd; +static void +versados_print_symbol (abfd, afile, symbol, how) + bfd *abfd; PTR afile; asymbol *symbol; bfd_print_symbol_type how; @@ -762,7 +780,7 @@ versados_print_symbol (ignore_abfd, afile, symbol, how) fprintf (file, "%s", symbol->name); break; default: - bfd_print_symbol_vandf ((PTR) file, symbol); + bfd_print_symbol_vandf (abfd, (PTR) file, symbol); fprintf (file, " %-5s %s", symbol->section->name, symbol->name); @@ -770,16 +788,15 @@ versados_print_symbol (ignore_abfd, afile, symbol, how) } } -long +static long versados_get_reloc_upper_bound (abfd, asect) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; sec_ptr asect; { return (asect->reloc_count + 1) * sizeof (arelent *); } - -long +static long versados_canonicalize_reloc (abfd, section, relptr, symbols) bfd *abfd; sec_ptr section; @@ -833,9 +850,10 @@ versados_canonicalize_reloc (abfd, section, relptr, symbols) #define versados_bfd_free_cached_info _bfd_generic_bfd_free_cached_info #define versados_new_section_hook _bfd_generic_new_section_hook -#define versados_bfd_is_local_label bfd_generic_is_local_label +#define versados_bfd_is_local_label_name bfd_generic_is_local_label_name #define versados_get_lineno _bfd_nosymbols_get_lineno #define versados_find_nearest_line _bfd_nosymbols_find_nearest_line +#define versados_make_empty_symbol _bfd_generic_make_empty_symbol #define versados_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol #define versados_read_minisymbols _bfd_generic_read_minisymbols #define versados_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol @@ -847,6 +865,8 @@ versados_canonicalize_reloc (abfd, section, relptr, symbols) #define versados_bfd_get_relocated_section_contents \ bfd_generic_get_relocated_section_contents #define versados_bfd_relax_section bfd_generic_relax_section +#define versados_bfd_gc_sections bfd_generic_gc_sections +#define versados_bfd_merge_sections bfd_generic_merge_sections #define versados_bfd_link_hash_table_create _bfd_generic_link_hash_table_create #define versados_bfd_link_add_symbols _bfd_generic_link_add_symbols #define versados_bfd_final_link _bfd_generic_final_link @@ -856,8 +876,8 @@ const bfd_target versados_vec = { "versados", /* name */ bfd_target_versados_flavour, - true, /* target byte order */ - true, /* target headers byte order */ + 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), @@ -902,5 +922,7 @@ const bfd_target versados_vec = BFD_JUMP_TABLE_LINK (versados), BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), + NULL, + (PTR) 0 };