X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcoff-mcore.c;h=fedcb0ab801df510c34e1d1d37d1e0dc6f646cfd;hb=43816ebc335481c99808c4fdfffb9ea3f510b19a;hp=7dad44fdcec6c8e9ba8b18532f98cd44508322a8;hpb=4b95cf5c0c75d6efc1b2f96af72317aecca079f1;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/coff-mcore.c b/bfd/coff-mcore.c index 7dad44fdce..fedcb0ab80 100644 --- a/bfd/coff-mcore.c +++ b/bfd/coff-mcore.c @@ -1,5 +1,5 @@ /* BFD back-end for Motorola MCore COFF/PE - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2020 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -60,32 +60,32 @@ static reloc_howto_type mcore_coff_howto_table[] = { /* Unused: */ HOWTO (IMAGE_REL_MCORE_ABSOLUTE,/* type */ - 0, /* rightshift */ - 0, /* size (0 = byte, 1 = short, 2 = long) */ - 0, /* bitsize */ - FALSE, /* pc_relative */ - 0, /* bitpos */ + 0, /* rightshift */ + 0, /* size (0 = byte, 1 = short, 2 = long) */ + 0, /* bitsize */ + FALSE, /* pc_relative */ + 0, /* bitpos */ complain_overflow_dont, /* dont complain_on_overflow */ - NULL, /* special_function */ - "ABSOLUTE", /* name */ - FALSE, /* partial_inplace */ - 0x00, /* src_mask */ - 0x00, /* dst_mask */ - FALSE), /* pcrel_offset */ + NULL, /* special_function */ + "ABSOLUTE", /* name */ + FALSE, /* partial_inplace */ + 0x00, /* src_mask */ + 0x00, /* dst_mask */ + FALSE), /* pcrel_offset */ HOWTO (IMAGE_REL_MCORE_ADDR32,/* type */ - 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - FALSE, /* pc_relative */ - 0, /* bitpos */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ + 32, /* bitsize */ + FALSE, /* pc_relative */ + 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ - NULL, /* special_function */ - "ADDR32", /* name */ - TRUE, /* partial_inplace */ - 0xffffffff, /* src_mask */ - 0xffffffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + NULL, /* special_function */ + "ADDR32", /* name */ + TRUE, /* partial_inplace */ + 0xffffffff, /* src_mask */ + 0xffffffff, /* dst_mask */ + FALSE), /* pcrel_offset */ /* 8 bits + 2 zero bits; jmpi/jsri/lrw instructions. Should not appear in object files. */ @@ -97,7 +97,7 @@ static reloc_howto_type mcore_coff_howto_table[] = 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ mcore_coff_unsupported_reloc, /* special_function */ - "IMM8BY4", /* name */ + "IMM8BY4", /* name */ FALSE, /* partial_inplace */ 0, /* src_mask */ 0, /* dst_mask */ @@ -113,8 +113,8 @@ static reloc_howto_type mcore_coff_howto_table[] = TRUE, /* pc_relative */ 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ - NULL, /* special_function */ - "IMM11BY2", /* name */ + NULL, /* special_function */ + "IMM11BY2", /* name */ FALSE, /* partial_inplace */ 0x0, /* src_mask */ 0x7ff, /* dst_mask */ @@ -129,7 +129,7 @@ static reloc_howto_type mcore_coff_howto_table[] = 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ mcore_coff_unsupported_reloc, /* special_function */ - "IMM4BY2", /* name */ + "IMM4BY2", /* name */ FALSE, /* partial_inplace */ 0, /* src_mask */ 0, /* dst_mask */ @@ -143,8 +143,8 @@ static reloc_howto_type mcore_coff_howto_table[] = TRUE, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ - NULL, /* special_function */ - "PCREL_32", /* name */ + NULL, /* special_function */ + "PCREL_32", /* name */ FALSE, /* partial_inplace */ 0x0, /* src_mask */ 0xffffffff, /* dst_mask */ @@ -164,22 +164,22 @@ static reloc_howto_type mcore_coff_howto_table[] = TRUE, /* pc_relative */ 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ - NULL, /* special_function */ - "JSR_IMM11BY2", /* name */ + NULL, /* special_function */ + "JSR_IMM11BY2", /* name */ FALSE, /* partial_inplace */ 0x0, /* src_mask */ 0x7ff, /* dst_mask */ TRUE), /* pcrel_offset */ - HOWTO (IMAGE_REL_MCORE_RVA, /* type */ + HOWTO (IMAGE_REL_MCORE_RVA, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 32, /* bitsize */ FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ - NULL, /* special_function */ - "MCORE_RVA", /* name */ + NULL, /* special_function */ + "MCORE_RVA", /* name */ TRUE, /* partial_inplace */ 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ @@ -194,11 +194,11 @@ typedef struct coff_mcore_link_hash_table /* The original coff_link_hash_table structure. MUST be first field. */ struct coff_link_hash_table root; - bfd * bfd_of_toc_owner; - long int global_toc_size; - long int import_table_size; - long int first_thunk_address; - long int thunk_size; + bfd * bfd_of_toc_owner; + long int global_toc_size; + long int import_table_size; + long int first_thunk_address; + long int thunk_size; } mcore_hash_table; @@ -216,9 +216,9 @@ mcore_emit_base_file_entry (struct bfd_link_info *info, bfd_vma reloc_offset) { bfd_vma addr = reloc_offset - - input_section->vma - + input_section->output_offset - + input_section->output_section->vma; + - input_section->vma + + input_section->output_offset + + input_section->output_section->vma; if (coff_data (output_bfd)->pe) addr -= pe_data (output_bfd)->pe_opthdr.ImageBase; @@ -241,7 +241,8 @@ mcore_coff_unsupported_reloc (bfd * abfd, { BFD_ASSERT (reloc_entry->howto != (reloc_howto_type *)0); - _bfd_error_handler (_("%B: Relocation %s (%d) is not currently supported.\n"), + /* xgettext: c-format */ + _bfd_error_handler (_("%pB: Relocation %s (%d) is not currently supported.\n"), abfd, reloc_entry->howto->name, reloc_entry->howto->type); @@ -259,13 +260,13 @@ mcore_coff_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED, { switch (code) { - HOW2MAP (BFD_RELOC_32, IMAGE_REL_MCORE_ADDR32); - HOW2MAP (BFD_RELOC_MCORE_PCREL_IMM8BY4, IMAGE_REL_MCORE_PCREL_IMM8BY4); - HOW2MAP (BFD_RELOC_MCORE_PCREL_IMM11BY2, IMAGE_REL_MCORE_PCREL_IMM11BY2); - HOW2MAP (BFD_RELOC_MCORE_PCREL_IMM4BY2, IMAGE_REL_MCORE_PCREL_IMM4BY2); - HOW2MAP (BFD_RELOC_32_PCREL, IMAGE_REL_MCORE_PCREL_32); + HOW2MAP (BFD_RELOC_32, IMAGE_REL_MCORE_ADDR32); + HOW2MAP (BFD_RELOC_MCORE_PCREL_IMM8BY4, IMAGE_REL_MCORE_PCREL_IMM8BY4); + HOW2MAP (BFD_RELOC_MCORE_PCREL_IMM11BY2, IMAGE_REL_MCORE_PCREL_IMM11BY2); + HOW2MAP (BFD_RELOC_MCORE_PCREL_IMM4BY2, IMAGE_REL_MCORE_PCREL_IMM4BY2); + HOW2MAP (BFD_RELOC_32_PCREL, IMAGE_REL_MCORE_PCREL_32); HOW2MAP (BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2, IMAGE_REL_MCORE_PCREL_JSR_IMM11BY2); - HOW2MAP (BFD_RELOC_RVA, IMAGE_REL_MCORE_RVA); + HOW2MAP (BFD_RELOC_RVA, IMAGE_REL_MCORE_RVA); default: return NULL; } @@ -273,16 +274,15 @@ mcore_coff_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED, } #undef HOW2MAP +#define NUM_HOWTOS NUM_ELEM (mcore_coff_howto_table) + static reloc_howto_type * mcore_coff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name) { unsigned int i; - for (i = 0; - i < (sizeof (mcore_coff_howto_table) - / sizeof (mcore_coff_howto_table[0])); - i++) + for (i = 0; i < NUM_HOWTOS; i++) if (mcore_coff_howto_table[i].name != NULL && strcasecmp (mcore_coff_howto_table[i].name, r_name) == 0) return &mcore_coff_howto_table[i]; @@ -290,8 +290,11 @@ mcore_coff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, return NULL; } -#define RTYPE2HOWTO(cache_ptr, dst) \ - (cache_ptr)->howto = mcore_coff_howto_table + (dst)->r_type; +#define RTYPE2HOWTO(cache_ptr, dst) \ + ((cache_ptr)->howto = \ + ((dst)->r_type < NUM_HOWTOS \ + ? mcore_coff_howto_table + (dst)->r_type \ + : NULL)) static reloc_howto_type * coff_mcore_rtype_to_howto (bfd * abfd ATTRIBUTE_UNUSED, @@ -303,7 +306,7 @@ coff_mcore_rtype_to_howto (bfd * abfd ATTRIBUTE_UNUSED, { reloc_howto_type * howto; - if (rel->r_type >= NUM_ELEM (mcore_coff_howto_table)) + if (rel->r_type >= NUM_HOWTOS) return NULL; howto = mcore_coff_howto_table + rel->r_type; @@ -316,11 +319,11 @@ coff_mcore_rtype_to_howto (bfd * abfd ATTRIBUTE_UNUSED, * addendp = sec->vma - 2; /* XXX guess - is this right ? */ /* If the symbol is defined, then the generic code is going to - add back the symbol value in order to cancel out an - adjustment it made to the addend. However, we set the addend - to 0 at the start of this function. We need to adjust here, - to avoid the adjustment the generic code will make. FIXME: - This is getting a bit hackish. */ + add back the symbol value in order to cancel out an + adjustment it made to the addend. However, we set the addend + to 0 at the start of this function. We need to adjust here, + to avoid the adjustment the generic code will make. FIXME: + This is getting a bit hackish. */ if (sym != NULL && sym->n_scnum != 0) * addendp -= sym->n_value; } @@ -356,18 +359,19 @@ coff_mcore_relocate_section (bfd * output_bfd, /* If we are performing a relocatable link, we don't need to do a thing. The caller will take care of adjusting the reloc addresses and symbol indices. */ - if (info->relocatable) + if (bfd_link_relocatable (info)) return TRUE; /* Check if we have the same endianness */ if ( input_bfd->xvec->byteorder != output_bfd->xvec->byteorder && output_bfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN) { - (*_bfd_error_handler) - (_("%B: compiled for a %s system and target is %s.\n"), + _bfd_error_handler + /* xgettext: c-format */ + (_("%pB: compiled for a %s system and target is %s.\n"), input_bfd, - bfd_big_endian (input_bfd) ? _("big endian") : _("little endian"), - bfd_big_endian (output_bfd) ? _("big endian") : _("little endian")); + bfd_big_endian (input_bfd) ? _("big endian") : _("little endian"), + bfd_big_endian (output_bfd) ? _("big endian") : _("little endian")); bfd_set_error (bfd_error_wrong_format); return FALSE; @@ -378,16 +382,16 @@ coff_mcore_relocate_section (bfd * output_bfd, for (; rel < relend; rel++) { - long symndx; - struct internal_syment * sym; - bfd_vma val; - bfd_vma addend; - bfd_reloc_status_type rstat; - bfd_byte * loc; - unsigned short r_type = rel->r_type; - reloc_howto_type * howto = NULL; + long symndx; + struct internal_syment * sym; + bfd_vma val; + bfd_vma addend; + bfd_reloc_status_type rstat; + bfd_byte * loc; + unsigned short r_type = rel->r_type; + reloc_howto_type * howto = NULL; struct coff_link_hash_entry * h; - const char * my_name; + const char * my_name; symndx = rel->r_symndx; loc = contents + rel->r_vaddr - input_section->vma; @@ -452,12 +456,9 @@ coff_mcore_relocate_section (bfd * output_bfd, + sec->output_offset); } else - { - if (! ((*info->callbacks->undefined_symbol) - (info, h->root.root.string, input_bfd, input_section, - rel->r_vaddr - input_section->vma, TRUE))) - return FALSE; - } + (*info->callbacks->undefined_symbol) + (info, h->root.root.string, input_bfd, input_section, + rel->r_vaddr - input_section->vma, TRUE); my_name = h->root.root.string; } @@ -468,18 +469,20 @@ coff_mcore_relocate_section (bfd * output_bfd, switch (r_type) { default: - _bfd_error_handler (_("%B: unsupported relocation type 0x%02x"), + /* xgettext: c-format */ + _bfd_error_handler (_("%pB: unsupported relocation type %#x"), input_bfd, r_type); bfd_set_error (bfd_error_bad_value); return FALSE; case IMAGE_REL_MCORE_ABSOLUTE: _bfd_error_handler - (_("Warning: unsupported reloc %s \n" - "sym %ld (%s), r_vaddr %ld (%lx)"), - input_bfd, input_section, howto->name, - rel->r_symndx, my_name, (long) rel->r_vaddr, - (unsigned long) rel->r_vaddr); + /* xgettext: c-format */ + (_("warning: unsupported reloc %s \n" + "sym %ld (%s), r_vaddr %" PRId64 " (%#" PRIx64 ")"), + howto->name, input_bfd, input_section, + rel->r_symndx, my_name, (int64_t) rel->r_vaddr, + (uint64_t) rel->r_vaddr); break; case IMAGE_REL_MCORE_PCREL_IMM8BY4: @@ -517,11 +520,10 @@ coff_mcore_relocate_section (bfd * output_bfd, break; case bfd_reloc_overflow: - if (! ((*info->callbacks->reloc_overflow) - (info, (h ? &h->root : NULL), my_name, howto->name, - (bfd_vma) 0, input_bfd, - input_section, rel->r_vaddr - input_section->vma))) - return FALSE; + (*info->callbacks->reloc_overflow) + (info, (h ? &h->root : NULL), my_name, howto->name, + (bfd_vma) 0, input_bfd, + input_section, rel->r_vaddr - input_section->vma); } } @@ -534,17 +536,17 @@ coff_mcore_relocate_section (bfd * output_bfd, #define coff_bfd_reloc_type_lookup mcore_coff_reloc_type_lookup #define coff_bfd_reloc_name_lookup mcore_coff_reloc_name_lookup -#define coff_relocate_section coff_mcore_relocate_section -#define coff_rtype_to_howto coff_mcore_rtype_to_howto +#define coff_relocate_section coff_mcore_relocate_section +#define coff_rtype_to_howto coff_mcore_rtype_to_howto #define SELECT_RELOC(internal, howto) {internal.r_type = howto->type;} /* Make sure that the 'r_offset' field is copied properly so that identical binaries will compare the same. */ -#define SWAP_IN_RELOC_OFFSET H_GET_32 -#define SWAP_OUT_RELOC_OFFSET H_PUT_32 +#define SWAP_IN_RELOC_OFFSET H_GET_32 +#define SWAP_OUT_RELOC_OFFSET H_PUT_32 -#define COFF_PAGE_SIZE 0x1000 +#define COFF_PAGE_SIZE 0x1000 #include "coffcode.h"