X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Felf32-msp430.c;h=94052fa0916a712b42ed060fa74fa4f48d014378;hb=5b677558bc6c7b2477bb33c709e6017e68e7ae8c;hp=edd49f7e4897d7f2b6bcffe0afcedc1ec72974c4;hpb=1ade71756948cad279f9b01d88ae762d144643e3;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c index edd49f7e48..94052fa091 100644 --- a/bfd/elf32-msp430.c +++ b/bfd/elf32-msp430.c @@ -1,5 +1,5 @@ /* MSP430-specific support for 32-bit ELF - Copyright (C) 2002-2015 Free Software Foundation, Inc. + Copyright (C) 2002-2016 Free Software Foundation, Inc. Contributed by Dmitry Diky This file is part of BFD, the Binary File Descriptor library. @@ -215,7 +215,7 @@ static reloc_howto_type elf_msp430_howto_table[] = FALSE, /* partial_inplace */ 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ - FALSE) /* pcrel_offset */ + FALSE) /* pcrel_offset */ }; static reloc_howto_type elf_msp430x_howto_table[] = @@ -473,7 +473,7 @@ static reloc_howto_type elf_msp430x_howto_table[] = TRUE), /* pcrel_offset */ EMPTY_HOWTO (R_MSP430_EHTYPE), - + /* A 10 bit PC relative relocation. */ HOWTO (R_MSP430X_10_PCREL, /* type */ 1, /* rightshift */ @@ -518,7 +518,7 @@ static reloc_howto_type elf_msp430x_howto_table[] = FALSE, /* partial_inplace */ 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ - FALSE) /* pcrel_offset */ + FALSE) /* pcrel_offset */ }; /* Map BFD reloc types to MSP430 ELF reloc types. */ @@ -672,7 +672,7 @@ elf32_msp430_check_relocs (bfd * abfd, struct bfd_link_info * info, const Elf_Internal_Rela *rel; const Elf_Internal_Rela *rel_end; - if (info->relocatable) + if (bfd_link_relocatable (info)) return TRUE; symtab_hdr = &elf_tdata (abfd)->symtab_hdr; @@ -739,7 +739,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, if (sym_diff_section != NULL) { BFD_ASSERT (sym_diff_section == input_section); - + if (uses_msp430x_relocs (input_bfd)) switch (howto->type) { @@ -778,7 +778,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, default: return bfd_reloc_dangerous; } - + sym_diff_section = NULL; } @@ -845,16 +845,16 @@ msp430_final_link_relocate (reloc_howto_type * howto, break; case R_MSP430X_PCR20_EXT_ODST: - /* [0,4]+[48,16] = ---F ---- FFFF */ + /* [0,4]+[48,16] = ---F ---- ---- FFFF */ contents += rel->r_offset; srel = (bfd_signed_vma) relocation; if (is_rel_reloc) { bfd_vma addend; addend = (bfd_get_16 (input_bfd, contents) & 0xf) << 16; - addend |= bfd_get_16 (input_bfd, contents+4); + addend |= bfd_get_16 (input_bfd, contents + 6); srel += addend; - + } else srel += rel->r_addend; @@ -868,14 +868,14 @@ msp430_final_link_relocate (reloc_howto_type * howto, break; case R_MSP430X_ABS20_EXT_SRC: - /* [7,4]+[32,16] = -78- FFFF */ + /* [7,4]+[32,16] = -78- ---- FFFF */ contents += rel->r_offset; srel = (bfd_signed_vma) relocation; if (is_rel_reloc) { bfd_vma addend; addend = (bfd_get_16 (input_bfd, contents) & 0x0780) << 9; - addend |= bfd_get_16 (input_bfd, contents+2); + addend |= bfd_get_16 (input_bfd, contents + 4); srel += addend; } else @@ -904,14 +904,14 @@ msp430_final_link_relocate (reloc_howto_type * howto, break; case R_MSP430X_PCR20_EXT_DST: - /* [0,4]+[32,16] = ---F FFFF */ + /* [0,4]+[32,16] = ---F ---- FFFF */ contents += rel->r_offset; srel = (bfd_signed_vma) relocation; if (is_rel_reloc) { bfd_vma addend; addend = (bfd_get_16 (input_bfd, contents) & 0xf) << 16; - addend |= bfd_get_16 (input_bfd, contents+2); + addend |= bfd_get_16 (input_bfd, contents + 4); srel += addend; } else @@ -927,14 +927,14 @@ msp430_final_link_relocate (reloc_howto_type * howto, break; case R_MSP430X_PCR20_EXT_SRC: - /* [7,4]+32,16] = -78- FFFF */ + /* [7,4]+[32,16] = -78- ---- FFFF */ contents += rel->r_offset; srel = (bfd_signed_vma) relocation; if (is_rel_reloc) { bfd_vma addend; addend = ((bfd_get_16 (input_bfd, contents) & 0x0780) << 9); - addend |= bfd_get_16 (input_bfd, contents+2); + addend |= bfd_get_16 (input_bfd, contents + 4); srel += addend;; } else @@ -961,10 +961,16 @@ msp430_final_link_relocate (reloc_howto_type * howto, break; case R_MSP430X_ABS20_EXT_DST: + /* [0,4]+[32,16] = ---F ---- FFFF */ contents += rel->r_offset; srel = (bfd_signed_vma) relocation; if (is_rel_reloc) - srel += bfd_get_16 (input_bfd, contents) & 0xf; + { + bfd_vma addend; + addend = (bfd_get_16 (input_bfd, contents) & 0xf) << 16; + addend |= bfd_get_16 (input_bfd, contents + 4); + srel += addend; + } else srel += rel->r_addend; bfd_put_16 (input_bfd, (srel & 0xffff), contents + 4); @@ -975,14 +981,14 @@ msp430_final_link_relocate (reloc_howto_type * howto, break; case R_MSP430X_ABS20_EXT_ODST: - /* [0,4]+[48,16] = ---F ---- FFFF */ + /* [0,4]+[48,16] = ---F ---- ---- FFFF */ contents += rel->r_offset; srel = (bfd_signed_vma) relocation; if (is_rel_reloc) { bfd_vma addend; addend = (bfd_get_16 (input_bfd, contents) & 0xf) << 16; - addend |= bfd_get_16 (input_bfd, contents+4); + addend |= bfd_get_16 (input_bfd, contents + 6); srel += addend; } else @@ -995,7 +1001,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, break; case R_MSP430X_ABS20_ADR_SRC: - /* [8,4]+[32,16] = -F-- FFFF */ + /* [8,4]+[16,16] = -F-- FFFF */ contents += rel->r_offset; srel = (bfd_signed_vma) relocation; if (is_rel_reloc) @@ -1003,7 +1009,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, bfd_vma addend; addend = ((bfd_get_16 (input_bfd, contents) & 0xf00) << 8); - addend |= bfd_get_16 (input_bfd, contents+2); + addend |= bfd_get_16 (input_bfd, contents + 2); srel += addend; } else @@ -1016,14 +1022,14 @@ msp430_final_link_relocate (reloc_howto_type * howto, break; case R_MSP430X_ABS20_ADR_DST: - /* [0,4]+[32,16] = ---F FFFF */ + /* [0,4]+[16,16] = ---F FFFF */ contents += rel->r_offset; srel = (bfd_signed_vma) relocation; if (is_rel_reloc) { bfd_vma addend; addend = ((bfd_get_16 (input_bfd, contents) & 0xf) << 16); - addend |= bfd_get_16 (input_bfd, contents+2); + addend |= bfd_get_16 (input_bfd, contents + 2); srel += addend; } else @@ -1044,7 +1050,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, srel += rel->r_addend; x = srel; if (x > 0xffff) - return bfd_reloc_overflow; + return bfd_reloc_overflow; bfd_put_16 (input_bfd, srel & 0xffff, contents); break; @@ -1056,16 +1062,16 @@ msp430_final_link_relocate (reloc_howto_type * howto, srel += rel->r_addend; bfd_put_16 (input_bfd, (srel >> 16) & 0xffff, contents); break; - + case R_MSP430X_PCR20_CALL: - /* [0,4]+[32,16] = ---F FFFF*/ + /* [0,4]+[16,16] = ---F FFFF*/ contents += rel->r_offset; srel = (bfd_signed_vma) relocation; if (is_rel_reloc) { bfd_vma addend; addend = (bfd_get_16 (input_bfd, contents) & 0xf) << 16; - addend |= bfd_get_16 (input_bfd, contents+2); + addend |= bfd_get_16 (input_bfd, contents + 2); srel += addend; } else @@ -1079,7 +1085,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, x = (x & 0xfff0) | (srel & 0xf); bfd_put_16 (input_bfd, x, contents); break; - + case R_MSP430X_PCR16: contents += rel->r_offset; srel = (bfd_signed_vma) relocation; @@ -1092,7 +1098,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, input_section->output_offset); bfd_put_16 (input_bfd, srel & 0xffff, contents); break; - + case R_MSP430_PREL31: contents += rel->r_offset; srel = (bfd_signed_vma) relocation; @@ -1105,7 +1111,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, x = (x & 0x80000000) | ((srel >> 31) & 0x7fffffff); bfd_put_32 (input_bfd, x, contents); break; - + default: r = _bfd_final_link_relocate (howto, input_bfd, input_section, contents, rel->r_offset, @@ -1146,7 +1152,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, } return bfd_reloc_overflow; } - + x = bfd_get_16 (input_bfd, contents); x = (x & 0xfc00) | (srel & 0x3ff); bfd_put_16 (input_bfd, x, contents); @@ -1234,7 +1240,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, bfd_put_8 (input_bfd, srel & 0xff, contents); break; - + case R_MSP430_SYM_DIFF: /* Cache the input section and value. The offset is unreliable, since relaxation may @@ -1322,7 +1328,7 @@ elf32_msp430_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED, RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section, rel, 1, relend, howto, 0, contents); - if (info->relocatable) + if (bfd_link_relocatable (info)) continue; r = msp430_final_link_relocate (howto, input_bfd, input_section, @@ -1335,15 +1341,14 @@ elf32_msp430_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED, switch (r) { case bfd_reloc_overflow: - r = info->callbacks->reloc_overflow + (*info->callbacks->reloc_overflow) (info, (h ? &h->root : NULL), name, howto->name, - (bfd_vma) 0, input_bfd, input_section, - rel->r_offset); + (bfd_vma) 0, input_bfd, input_section, rel->r_offset); break; case bfd_reloc_undefined: - r = info->callbacks->undefined_symbol - (info, name, input_bfd, input_section, rel->r_offset, TRUE); + (*info->callbacks->undefined_symbol) + (info, name, input_bfd, input_section, rel->r_offset, TRUE); break; case bfd_reloc_outofrange: @@ -1364,11 +1369,8 @@ elf32_msp430_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED, } if (msg) - r = info->callbacks->warning - (info, msg, name, input_bfd, input_section, rel->r_offset); - - if (!r) - return FALSE; + (*info->callbacks->warning) (info, msg, name, input_bfd, + input_section, rel->r_offset); } } @@ -1459,7 +1461,7 @@ elf32_msp430_object_p (bfd * abfd) case E_MSP430_MACH_MSP430X: e_set = bfd_mach_msp430x; break; } } - + return bfd_default_set_arch_mach (abfd, bfd_arch_msp430, e_set); } @@ -1627,7 +1629,7 @@ msp430_elf_relax_adjust_locals (bfd * abfd, asection * sec, bfd_vma addr, && lsym->st_shndx == sec_shndx) irel->r_addend -= count; } - + return TRUE; } @@ -1676,7 +1678,7 @@ msp430_elf_relax_delete_bytes (bfd * abfd, asection * sec, bfd_vma addr, for (p = abfd->sections; p != NULL; p = p->next) msp430_elf_relax_adjust_locals (abfd,p,addr,count,sec_shndx,toaddr); - + /* Adjust the local symbols defined in this section. */ symtab_hdr = & elf_tdata (abfd)->symtab_hdr; isym = (Elf_Internal_Sym *) symtab_hdr->contents; @@ -1690,7 +1692,7 @@ msp430_elf_relax_delete_bytes (bfd * abfd, asection * sec, bfd_vma addr, if (isym->st_shndx != sec_shndx) continue; - + if (isym->st_value > addr && (isym->st_value < toaddr /* We also adjust a symbol at the end of the section if its name is @@ -1778,7 +1780,7 @@ msp430_elf_relax_add_two_words (bfd * abfd, asection * sec, bfd_vma addr, /* Update the section information. */ sec->size += 4; - elf_section_data (sec)->this_hdr.contents = contents; + elf_section_data (sec)->this_hdr.contents = contents; /* Adjust all the relocs. */ irel = elf_section_data (sec)->relocs; @@ -1821,7 +1823,7 @@ msp430_elf_relax_add_two_words (bfd * abfd, asection * sec, bfd_vma addr, return contents; } - + static bfd_boolean msp430_elf_relax_section (bfd * abfd, asection * sec, struct bfd_link_info * link_info, @@ -1840,7 +1842,7 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, /* We don't have to do anything for a relocatable link, if this section does not have relocs, or if this is not a code section. */ - if (link_info->relocatable + if (bfd_link_relocatable (link_info) || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 || (sec->flags & SEC_CODE) == 0) return TRUE; @@ -1961,7 +1963,7 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, /* Get the opcode. */ opcode = bfd_get_16 (abfd, contents + irel->r_offset); - + /* Compute the new opcode. We are going to convert: J label into: @@ -1970,7 +1972,7 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, 1: */ switch (opcode & 0xfc00) { - case 0x3800: opcode = 0x3402; break; /* Jl -> Jge +2 */ + case 0x3800: opcode = 0x3402; break; /* Jl -> Jge +2 */ case 0x3400: opcode = 0x3802; break; /* Jge -> Jl +2 */ case 0x2c00: opcode = 0x2802; break; /* Jhs -> Jlo +2 */ case 0x2800: opcode = 0x2c02; break; /* Jlo -> Jhs +2 */ @@ -2001,7 +2003,7 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, /* Insert the new branch instruction. */ if (uses_msp430x_relocs (abfd)) { - /* Insert an absolute branch (aka MOVA) instruction. */ + /* Insert an absolute branch (aka MOVA) instruction. */ contents = msp430_elf_relax_add_two_words (abfd, sec, irel->r_offset + 2, 0x0080, 0x0000); @@ -2108,7 +2110,7 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, /* Try to turn a 16bit pc-relative branch into a 10bit pc-relative branch. */ - /* Paranoia? paranoia... */ + /* Paranoia? paranoia... */ if (! uses_msp430x_relocs (abfd) && ELF32_R_TYPE (irel->r_info) == (int) R_MSP430_RL_PCREL) { @@ -2231,7 +2233,7 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, value -= (sec->output_section->vma + sec->output_offset); value -= irel->r_offset; value += irel->r_addend; - + /* See if the value will fit in 10 bits, note the high value is 1016 as the target will be two bytes closer if we are able to relax. */ @@ -2499,7 +2501,7 @@ elf32_msp430_merge_mspabi_attributes (bfd *ibfd, bfd *obfd) data_model (in_attr[OFBA_MSPABI_Tag_Data_Model].i)); result = FALSE; } - + return result; } @@ -2526,13 +2528,34 @@ msp430_elf_is_target_special_symbol (bfd *abfd, asymbol *sym) return _bfd_elf_is_local_label_name (abfd, sym->name); } +static bfd_boolean +uses_large_model (bfd *abfd) +{ + obj_attribute * attr; + + if (abfd->flags & BFD_LINKER_CREATED) + return FALSE; + + attr = elf_known_obj_attributes_proc (abfd); + if (attr == NULL) + return FALSE; + + return attr[OFBA_MSPABI_Tag_Code_Model].i == 2; +} + +static unsigned int +elf32_msp430_eh_frame_address_size (bfd *abfd, asection *sec ATTRIBUTE_UNUSED) +{ + return uses_large_model (abfd) ? 4 : 2; +} + /* This is gross. The MSP430 EABI says that (sec 11.5): "An implementation may choose to use Rel or Rela type relocations for other relocations." But it also says that: - + "Certain relocations are identified as Rela only. [snip] Where Rela is specified, an implementation must honor this requirement." @@ -2557,6 +2580,7 @@ msp430_elf_is_target_special_symbol (bfd *abfd, asymbol *sym) #undef elf_backend_obj_attrs_arg_type #define elf_backend_obj_attrs_arg_type elf32_msp430_obj_attrs_arg_type #define bfd_elf32_bfd_merge_private_bfd_data elf32_msp430_merge_private_bfd_data +#define elf_backend_eh_frame_address_size elf32_msp430_eh_frame_address_size #define ELF_ARCH bfd_arch_msp430 #define ELF_MACHINE_CODE EM_MSP430 @@ -2589,7 +2613,7 @@ msp430_elf_is_target_special_symbol (bfd *abfd, asymbol *sym) #undef elf32_bed #define elf32_bed elf32_msp430_ti_bed -#undef ELF_OSABI +#undef ELF_OSABI #define ELF_OSABI ELFOSABI_NONE static const struct bfd_elf_special_section msp430_ti_elf_special_sections[] = @@ -2601,4 +2625,7 @@ static const struct bfd_elf_special_section msp430_ti_elf_special_sections[] = { NULL, 0, 0, 0, 0 } }; +#undef elf_backend_special_sections +#define elf_backend_special_sections msp430_ti_elf_special_sections + #include "elf32-target.h"