X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcoff-i960.c;h=e83fbac774e8e87d2bb7d8001554d18d4b1fb80e;hb=3db64b009284dda3a1ce10a91beb1297475e60a7;hp=25455d9ead8cf4b22e1dd2345ad5b5b757374a25;hpb=5b64ad42d36e6d487e1f7287d37fbc243a178e72;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/coff-i960.c b/bfd/coff-i960.c index 25455d9ead..e83fbac774 100644 --- a/bfd/coff-i960.c +++ b/bfd/coff-i960.c @@ -1,5 +1,6 @@ /* BFD back-end for Intel 960 COFF files. - Copyright (C) 1990, 91, 92, 93, 94, 95, 1997 Free Software Foundation, Inc. + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001, + 2002, 2003, 2004, 2007 Free Software Foundation, Inc. Written by Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -16,39 +17,40 @@ GNU General Public License for more details. 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 I960 1 #define BADMAG(x) I960BADMAG(x) -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" #include "coff/i960.h" #include "coff/internal.h" #include "libcoff.h" /* to allow easier abstraction-breaking */ -static boolean coff_i960_is_local_label_name PARAMS ((bfd *, const char *)); +static bfd_boolean coff_i960_is_local_label_name + PARAMS ((bfd *, const char *)); static bfd_reloc_status_type optcall_callback PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); static bfd_reloc_status_type coff_i960_relocate PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); static reloc_howto_type *coff_i960_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_code_real_type)); -static boolean coff_i960_start_final_link +static bfd_boolean coff_i960_start_final_link PARAMS ((bfd *, struct bfd_link_info *)); -static boolean coff_i960_relocate_section +static bfd_boolean coff_i960_relocate_section PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, struct internal_reloc *, struct internal_syment *, asection **)); -static boolean coff_i960_adjust_symndx +static bfd_boolean coff_i960_adjust_symndx PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, - struct internal_reloc *, boolean *)); + struct internal_reloc *, bfd_boolean *)); #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3) #define COFF_ALIGN_IN_SECTION_HEADER 1 -#define GET_SCNHDR_ALIGN bfd_h_get_32 -#define PUT_SCNHDR_ALIGN bfd_h_put_32 +#define GET_SCNHDR_ALIGN H_GET_32 +#define PUT_SCNHDR_ALIGN H_PUT_32 /* The i960 does not support an MMU, so COFF_PAGE_SIZE can be arbitrarily small. */ @@ -58,9 +60,9 @@ static boolean coff_i960_adjust_symndx /* This set of local label names is taken from gas. */ -static boolean +static bfd_boolean coff_i960_is_local_label_name (abfd, name) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; const char *name; { return (name[0] == 'L' @@ -98,7 +100,7 @@ coff_i960_is_local_label_name (abfd, name) #define BAL 0x0b000000 /* Template for 'bal' instruction */ #define BAL_MASK 0x00ffffff -static bfd_reloc_status_type +static bfd_reloc_status_type optcall_callback (abfd, reloc_entry, symbol_in, data, input_section, ignore_bfd, error_message) bfd *abfd; @@ -106,7 +108,7 @@ optcall_callback (abfd, reloc_entry, symbol_in, data, asymbol *symbol_in; PTR data; asection *input_section; - bfd *ignore_bfd; + bfd *ignore_bfd ATTRIBUTE_UNUSED; char **error_message; { /* This item has already been relocated correctly, but we may be @@ -116,13 +118,13 @@ optcall_callback (abfd, reloc_entry, symbol_in, data, coff_symbol_type *cs = coffsymbol(symbol_in); /* Don't do anything with symbols which aren't tied up yet, - except move the reloc. */ + except move the reloc. */ if (bfd_is_und_section (cs->symbol.section)) { reloc_entry->address += input_section->output_offset; return bfd_reloc_ok; } - - /* So the target symbol has to be of coff type, and the symbol + + /* So the target symbol has to be of coff type, and the symbol has to have the correct native information within it */ if ((bfd_asymbol_flavour(&cs->symbol) != bfd_target_coff_flavour) || (cs->native == (combined_entry_type *)NULL)) @@ -137,7 +139,7 @@ optcall_callback (abfd, reloc_entry, symbol_in, data, } else { - switch (cs->native->u.syment.n_sclass) + switch (cs->native->u.syment.n_sclass) { case C_LEAFSTAT: case C_LEAFEXT: @@ -145,7 +147,7 @@ optcall_callback (abfd, reloc_entry, symbol_in, data, to the correct location. */ { union internal_auxent *aux = &((cs->native+2)->u.auxent); - int word = bfd_get_32(abfd, (bfd_byte *)data + reloc_entry->address); + int word = bfd_get_32 (abfd, (bfd_byte *)data + reloc_entry->address); int olf = (aux->x_bal.x_balntry - cs->native->u.syment.n_value); BFD_ASSERT(cs->native->u.syment.n_numaux==2); @@ -155,7 +157,8 @@ optcall_callback (abfd, reloc_entry, symbol_in, data, sym and auxents untouched, so the delta between the two is the offset of the bal entry point. */ word = ((word + olf) & BAL_MASK) | BAL; - bfd_put_32(abfd, word, (bfd_byte *) data + reloc_entry->address); + bfd_put_32 (abfd, (bfd_vma) word, + (bfd_byte *) data + reloc_entry->address); } result = bfd_reloc_ok; break; @@ -177,32 +180,32 @@ optcall_callback (abfd, reloc_entry, symbol_in, data, same object file. It appears to simply discard such relocs, rather than adding their values into the object file. We handle this here by converting all relocs against defined symbols into relocs - against the section symbol, when generating a relocateable output + against the section symbol, when generating a relocatable output file. Note that this function is only called if we are not using the COFF specific backend linker. It only does something when doing a - relocateable link, which will almost certainly fail when not + relocatable link, which will almost certainly fail when not generating COFF i960 output, so this function is actually no longer useful. It was used before this target was converted to use the COFF specific backend linker. */ -static bfd_reloc_status_type +static bfd_reloc_status_type coff_i960_relocate (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message) bfd *abfd; arelent *reloc_entry; asymbol *symbol; - PTR data; - asection *input_section; + PTR data ATTRIBUTE_UNUSED; + asection *input_section ATTRIBUTE_UNUSED; bfd *output_bfd; - char **error_message; + char **error_message ATTRIBUTE_UNUSED; { asection *osec; if (output_bfd == NULL) { - /* Not generating relocateable output file. */ + /* Not generating relocatable output file. */ return bfd_reloc_continue; } @@ -250,9 +253,8 @@ coff_i960_relocate (abfd, reloc_entry, symbol, data, input_section, if (coff_section_data (output_bfd, osec) == NULL) { - osec->used_by_bfd = - ((PTR) bfd_zalloc (abfd, - sizeof (struct coff_section_tdata))); + bfd_size_type amt = sizeof (struct coff_section_tdata); + osec->used_by_bfd = (PTR) bfd_zalloc (abfd, amt); if (osec->used_by_bfd == NULL) return bfd_reloc_overflow; } @@ -265,19 +267,19 @@ coff_i960_relocate (abfd, reloc_entry, symbol, data, input_section, } static reloc_howto_type howto_rellong = - HOWTO ((unsigned int) R_RELLONG, 0, 2, 32,false, 0, - complain_overflow_bitfield, coff_i960_relocate,"rellong", true, + HOWTO ((unsigned int) R_RELLONG, 0, 2, 32,FALSE, 0, + complain_overflow_bitfield, coff_i960_relocate,"rellong", TRUE, 0xffffffff, 0xffffffff, 0); static reloc_howto_type howto_iprmed = - HOWTO (R_IPRMED, 0, 2, 24,true,0, complain_overflow_signed, - coff_i960_relocate, "iprmed ", true, 0x00ffffff, 0x00ffffff, 0); + HOWTO (R_IPRMED, 0, 2, 24,TRUE,0, complain_overflow_signed, + coff_i960_relocate, "iprmed ", TRUE, 0x00ffffff, 0x00ffffff, 0); static reloc_howto_type howto_optcall = - HOWTO (R_OPTCALL, 0,2,24,true,0, complain_overflow_signed, - optcall_callback, "optcall", true, 0x00ffffff, 0x00ffffff, 0); + HOWTO (R_OPTCALL, 0,2,24,TRUE,0, complain_overflow_signed, + optcall_callback, "optcall", TRUE, 0x00ffffff, 0x00ffffff, 0); static reloc_howto_type * coff_i960_reloc_type_lookup (abfd, code) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; bfd_reloc_code_real_type code; { switch (code) @@ -294,6 +296,20 @@ coff_i960_reloc_type_lookup (abfd, code) } } +static reloc_howto_type * +coff_i960_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, + const char *r_name) +{ + if (strcasecmp (howto_optcall.name, r_name) == 0) + return &howto_optcall; + if (strcasecmp (howto_rellong.name, r_name) == 0) + return &howto_rellong; + if (strcasecmp (howto_iprmed.name, r_name) == 0) + return &howto_iprmed; + + return NULL; +} + /* The real code is in coffcode.h */ #define RTYPE2HOWTO(cache_ptr, dst) \ @@ -317,7 +333,7 @@ coff_i960_reloc_type_lookup (abfd, code) called at the start of the linking process, and it creates the necessary symbols. */ -static boolean +static bfd_boolean coff_i960_start_final_link (abfd, info) bfd *abfd; struct bfd_link_info *info; @@ -326,15 +342,15 @@ coff_i960_start_final_link (abfd, info) asection *o; bfd_byte *esym; - if (! info->relocateable) - return true; + if (! info->relocatable) + return TRUE; esym = (bfd_byte *) bfd_malloc (symesz); if (esym == NULL) - return false; + return FALSE; if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0) - return false; + return FALSE; for (o = abfd->sections; o != NULL; o = o->next) { @@ -349,10 +365,10 @@ coff_i960_start_final_link (abfd, info) bfd_coff_swap_sym_out (abfd, (PTR) &isym, (PTR) esym); - if (bfd_write (esym, symesz, 1, abfd) != symesz) + if (bfd_bwrite (esym, symesz, abfd) != symesz) { free (esym); - return false; + return FALSE; } obj_raw_syment_count (abfd) += 1; @@ -360,15 +376,15 @@ coff_i960_start_final_link (abfd, info) free (esym); - return true; + return TRUE; } /* The reloc processing routine for the optimized COFF linker. */ -static boolean +static bfd_boolean coff_i960_relocate_section (output_bfd, info, input_bfd, input_section, contents, relocs, syms, sections) - bfd *output_bfd; + bfd *output_bfd ATTRIBUTE_UNUSED; struct bfd_link_info *info; bfd *input_bfd; asection *input_section; @@ -391,7 +407,7 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section, bfd_vma val; reloc_howto_type *howto; bfd_reloc_status_type rstat = bfd_reloc_ok; - boolean done; + bfd_boolean done; symndx = rel->r_symndx; @@ -401,7 +417,7 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section, sym = NULL; } else - { + { h = obj_coff_sym_hashes (input_bfd)[symndx]; sym = syms + symndx; } @@ -418,7 +434,7 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section, case 27: howto = &howto_optcall; break; default: bfd_set_error (bfd_error_bad_value); - return false; + return FALSE; } val = 0; @@ -453,18 +469,18 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section, + sec->output_section->vma + sec->output_offset); } - else if (! info->relocateable) + else if (! info->relocatable) { if (! ((*info->callbacks->undefined_symbol) (info, h->root.root.string, input_bfd, input_section, - rel->r_vaddr - input_section->vma))) - return false; + rel->r_vaddr - input_section->vma, TRUE))) + return FALSE; } } - done = false; + done = FALSE; - if (howto->type == R_OPTCALL && ! info->relocateable && symndx != -1) + if (howto->type == R_OPTCALL && ! info->relocatable && symndx != -1) { int class; @@ -484,7 +500,7 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section, _("uncertain calling convention for non-COFF symbol"), input_bfd, input_section, rel->r_vaddr - input_section->vma))) - return false; + return FALSE; break; case C_LEAFSTAT: case C_LEAFEXT: @@ -518,10 +534,9 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section, + (rel->r_vaddr - input_section->vma))); word = ((word + olf - val) & BAL_MASK) | BAL; bfd_put_32 (input_bfd, - word, - (contents - + (rel->r_vaddr - input_section->vma))); - done = true; + (bfd_vma) word, + contents + (rel->r_vaddr - input_section->vma)); + done = TRUE; } break; case C_SCALL: @@ -554,53 +569,53 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section, if (symndx == -1) name = "*ABS*"; else if (h != NULL) - name = h->root.root.string; + name = NULL; else { name = _bfd_coff_internal_syment_name (input_bfd, sym, buf); if (name == NULL) - return false; + return FALSE; } if (! ((*info->callbacks->reloc_overflow) - (info, name, howto->name, (bfd_vma) 0, input_bfd, - input_section, rel->r_vaddr - input_section->vma))) - return false; + (info, (h ? &h->root : NULL), name, howto->name, + (bfd_vma) 0, input_bfd, input_section, + rel->r_vaddr - input_section->vma))) + return FALSE; } } } - return true; + return TRUE; } /* Adjust the symbol index of any reloc against a global symbol to instead be a reloc against the internal symbol we created specially for the section. */ -/*ARGSUSED*/ -static boolean +static bfd_boolean coff_i960_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp) - bfd *obfd; - struct bfd_link_info *info; + bfd *obfd ATTRIBUTE_UNUSED; + struct bfd_link_info *info ATTRIBUTE_UNUSED; bfd *ibfd; - asection *sec; + asection *sec ATTRIBUTE_UNUSED; struct internal_reloc *irel; - boolean *adjustedp; + bfd_boolean *adjustedp; { struct coff_link_hash_entry *h; - *adjustedp = false; + *adjustedp = FALSE; h = obj_coff_sym_hashes (ibfd)[irel->r_symndx]; if (h == NULL || (h->root.type != bfd_link_hash_defined && h->root.type != bfd_link_hash_defweak)) - return true; + return TRUE; irel->r_symndx = h->root.u.def.section->output_section->target_index - 1; - *adjustedp = true; + *adjustedp = TRUE; - return true; + return TRUE; } #define coff_bfd_is_local_label_name coff_i960_is_local_label_name @@ -612,52 +627,13 @@ coff_i960_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp) #define coff_adjust_symndx coff_i960_adjust_symndx #define coff_bfd_reloc_type_lookup coff_i960_reloc_type_lookup +#define coff_bfd_reloc_name_lookup coff_i960_reloc_name_lookup #include "coffcode.h" -const bfd_target icoff_little_vec = -{ - "coff-Intel-little", /* name */ - bfd_target_coff_flavour, - BFD_ENDIAN_LITTLE, /* data byte order is little */ - BFD_ENDIAN_LITTLE, /* header byte order is little */ - - (HAS_RELOC | EXEC_P | /* object flags */ - HAS_LINENO | HAS_DEBUG | - HAS_SYMS | HAS_LOCALS | WP_TEXT), - - (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ - '_', /* leading underscore */ - '/', /* ar_pad_char */ - 15, /* ar_max_namelen */ - - bfd_getl64, bfd_getl_signed_64, bfd_putl64, - bfd_getl32, bfd_getl_signed_32, bfd_putl32, - bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */ - bfd_getl64, bfd_getl_signed_64, bfd_putl64, - bfd_getl32, bfd_getl_signed_32, bfd_putl32, - bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */ - - {_bfd_dummy_target, coff_object_p, /* bfd_check_format */ - bfd_generic_archive_p, _bfd_dummy_target}, - {bfd_false, coff_mkobject, /* bfd_set_format */ - _bfd_generic_mkarchive, bfd_false}, - {bfd_false, coff_write_object_contents, /* bfd_write_contents */ - _bfd_write_archive_contents, bfd_false}, - - BFD_JUMP_TABLE_GENERIC (coff), - BFD_JUMP_TABLE_COPY (coff), - BFD_JUMP_TABLE_CORE (_bfd_nocore), - BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff), - BFD_JUMP_TABLE_SYMBOLS (coff), - BFD_JUMP_TABLE_RELOCS (coff), - BFD_JUMP_TABLE_WRITE (coff), - BFD_JUMP_TABLE_LINK (coff), - BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), - - COFF_SWAP_TABLE, -}; +extern const bfd_target icoff_big_vec; +CREATE_LITTLE_COFF_TARGET_VEC (icoff_little_vec, "coff-Intel-little", 0, 0, '_', & icoff_big_vec, COFF_SWAP_TABLE) const bfd_target icoff_big_vec = { @@ -699,5 +675,7 @@ bfd_getb64, bfd_getb_signed_64, bfd_putb64, BFD_JUMP_TABLE_LINK (coff), BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), - COFF_SWAP_TABLE, + & icoff_little_vec, + + COFF_SWAP_TABLE };