X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Felf32-visium.c;h=fd45dad4359a5db64439ddc232b29a71988354e6;hb=f0927d2036f0abbbcdade43005824e6170b3dc0e;hp=3f8d16aa97c6719ba49d0e235ade1d49e57dd5d0;hpb=f3185997ac0951edac802e29df03dfc0844fda34;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-visium.c b/bfd/elf32-visium.c index 3f8d16aa97..fd45dad435 100644 --- a/bfd/elf32-visium.c +++ b/bfd/elf32-visium.c @@ -1,6 +1,6 @@ /* Visium-specific support for 32-bit ELF. - Copyright (C) 2003-2018 Free Software Foundation, Inc. + Copyright (C) 2003-2021 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -25,6 +25,7 @@ #include "libbfd.h" #include "elf-bfd.h" #include "elf/visium.h" +#include "libiberty.h" static bfd_reloc_status_type visium_elf_howto_parity_reloc (bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **); @@ -35,60 +36,60 @@ static reloc_howto_type visium_elf_howto_table[] = { 0, /* rightshift */ 3, /* size (0 = byte, 1 = short, 2 = long) */ 0, /* bitsize */ - FALSE, /* pc_relative */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ bfd_elf_generic_reloc, /* special_function */ "R_VISIUM_NONE", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0, /* src_mask */ 0, /* dst_mask */ - FALSE), /* pcrel_offset */ + false), /* pcrel_offset */ /* A 8 bit absolute relocation. */ HOWTO (R_VISIUM_8, /* type */ 0, /* rightshift */ 0, /* size (0 = byte, 1 = short, 2 = long) */ 8, /* bitsize */ - FALSE, /* pc_relative */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ bfd_elf_generic_reloc, /* special_function */ "R_VISIUM_8", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0x00, /* src_mask */ 0xff, /* dst_mask */ - FALSE), /* pcrel_offset */ + false), /* pcrel_offset */ /* A 16 bit absolute relocation. */ HOWTO (R_VISIUM_16, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - FALSE, /* pc_relative */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ bfd_elf_generic_reloc, /* special_function */ "R_VISIUM_16", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0x0000, /* src_mask */ 0xffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + false), /* pcrel_offset */ /* A 32 bit absolute relocation. */ HOWTO (R_VISIUM_32, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 32, /* bitsize */ - FALSE, /* pc_relative */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ bfd_elf_generic_reloc, /* special_function */ "R_VISIUM_32", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0x00000000, /* src_mask */ 0xffffffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + false), /* pcrel_offset */ /* A 8 bit PC relative relocation. */ @@ -96,45 +97,45 @@ static reloc_howto_type visium_elf_howto_table[] = { 0, /* rightshift */ 0, /* size (0 = byte, 1 = short, 2 = long) */ 8, /* bitsize */ - TRUE, /* pc_relative */ + true, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ bfd_elf_generic_reloc, /* special_function */ "R_VISIUM_8_PCREL", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0x00, /* src_mask */ 0xff, /* dst_mask */ - TRUE), /* pcrel_offset */ + true), /* pcrel_offset */ /* A 16 bit PC relative relocation. */ HOWTO (R_VISIUM_16_PCREL, /* type */ 0, /* rightshift */ 1, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - TRUE, /* pc_relative */ + true, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ bfd_elf_generic_reloc, /* special_function */ "R_VISIUM_16_PCREL", /* name */ - FALSE, /* partial inplace */ + false, /* partial inplace */ 0x0000, /* src_mask */ 0xffff, /* dst_mask */ - TRUE), /* pcrel_offset */ + true), /* pcrel_offset */ /* A 32-bit PC relative relocation. */ HOWTO (R_VISIUM_32_PCREL, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 32, /* bitsize */ - TRUE, /* pc_relative */ + true, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ bfd_elf_generic_reloc, /* special_function */ "R_VISIUM_32_PCREL", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0, /* src_mask */ 0xffffffff, /* dst_mask */ - TRUE), /* pcrel_offset */ + true), /* pcrel_offset */ /* A 16-bit PC word relative offset, relative to start of instruction and always in the second half of the instruction. */ @@ -142,105 +143,105 @@ static reloc_howto_type visium_elf_howto_table[] = { 2, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - TRUE, /* pc_relative */ + true, /* pc_relative */ 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ visium_elf_howto_parity_reloc, /* special_function */ "R_VISIUM_PC16", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0x00000000, /* src_mask */ 0x0000ffff, /* dst_mask */ - TRUE), /* pcrel_offset */ + true), /* pcrel_offset */ /* The high 16 bits of symbol value. */ HOWTO (R_VISIUM_HI16, /* type */ 16, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - FALSE, /* pc_relative */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ visium_elf_howto_parity_reloc, /* special_function */ "R_VISIUM_HI16", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0x00000000, /* src_mask */ 0x0000ffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + false), /* pcrel_offset */ /* The low 16 bits of symbol value. */ HOWTO (R_VISIUM_LO16, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - FALSE, /* pc_relative */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ visium_elf_howto_parity_reloc, /* special_function */ "R_VISIUM_LO16", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0x00000000, /* src_mask */ 0x0000ffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + false), /* pcrel_offset */ /* A 16 bit immediate value. */ HOWTO (R_VISIUM_IM16, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - FALSE, /* pc_relative */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_unsigned, /* complain_on_overflow */ visium_elf_howto_parity_reloc, /* special_function */ "R_VISIUM_IM16", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0x0000000, /* src_mask */ 0x000ffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + false), /* pcrel_offset */ /* The high 16 bits of symbol value, pc relative. */ HOWTO (R_VISIUM_HI16_PCREL, /* type */ 16, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - TRUE, /* pc_relative */ + true, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ visium_elf_howto_parity_reloc, /* special_function */ "R_VISIUM_HI16_PCREL", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0x00000000, /* src_mask */ 0x0000ffff, /* dst_mask */ - TRUE), /* pcrel_offset */ + true), /* pcrel_offset */ /* The low 16 bits of symbol value, pc relative. */ HOWTO (R_VISIUM_LO16_PCREL, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - TRUE, /* pc_relative */ + true, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ visium_elf_howto_parity_reloc, /* special_function */ "R_VISIUM_LO16_PCREL", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0x00000000, /* src_mask */ 0x0000ffff, /* dst_mask */ - TRUE), /* pcrel_offset */ + true), /* pcrel_offset */ /* A 16 bit immediate value, pc relative. */ HOWTO (R_VISIUM_IM16_PCREL, /* type */ 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - TRUE, /* pc_relative */ + true, /* pc_relative */ 0, /* bitpos */ complain_overflow_unsigned, /* complain_on_overflow */ visium_elf_howto_parity_reloc, /* special_function */ "R_VISIUM_IM16_PCREL", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0x0000000, /* src_mask */ 0x000ffff, /* dst_mask */ - TRUE), /* pcrel_offset */ + true), /* pcrel_offset */ }; @@ -250,15 +251,15 @@ static reloc_howto_type visium_elf_vtinherit_howto = 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 0, /* bitsize */ - FALSE, /* pc_relative */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ NULL, /* special_function */ "R_VISIUM_GNU_VTINHERIT", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0, /* src_mask */ 0, /* dst_mask */ - FALSE); /* pcrel_offset */ + false); /* pcrel_offset */ /* GNU extension to record C++ vtable member usage. */ static reloc_howto_type visium_elf_vtentry_howto = @@ -266,15 +267,15 @@ static reloc_howto_type visium_elf_vtentry_howto = 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 0, /* bitsize */ - FALSE, /* pc_relative */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ NULL, /* special_function */ "R_VISIUM_GNU_VTENTRY", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0, /* src_mask */ 0, /* dst_mask */ - FALSE); /* pcrel_offset */ + false); /* pcrel_offset */ /* Return the parity bit for INSN shifted to its final position. */ @@ -311,7 +312,6 @@ visium_elf_howto_parity_reloc (bfd * input_bfd, arelent *reloc_entry, bfd_vma relocation; bfd_byte *inplace_address; bfd_vma insn; - const bfd_vma signmask = 0xffff8000; /* This part is from bfd_elf_generic_reloc. If we're relocating, and this an external symbol, we don't want @@ -350,19 +350,19 @@ visium_elf_howto_parity_reloc (bfd * input_bfd, arelent *reloc_entry, if (reloc_entry->howto->pc_relative) { - relocation -= input_section->output_section->vma - + input_section->output_offset; + relocation -= input_section->output_section->vma; + relocation -= input_section->output_offset; relocation -= reloc_entry->address; } switch (reloc_entry->howto->type) { case R_VISIUM_PC16: - relocation >>= 2; - if (ret == bfd_reloc_ok && (relocation & signmask) != 0 - && (relocation & signmask) != signmask) + if (ret == bfd_reloc_ok + && ((bfd_signed_vma) relocation < -0x20000 + || (bfd_signed_vma) relocation > 0x1ffff)) ret = bfd_reloc_overflow; - relocation &= 0xffff; + relocation = (relocation >> 2) & 0xffff; break; case R_VISIUM_HI16: case R_VISIUM_HI16_PCREL: @@ -458,7 +458,7 @@ visium_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name) /* Set the howto pointer for a VISIUM ELF reloc. */ -static bfd_boolean +static bool visium_info_to_howto_rela (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst) { @@ -475,25 +475,25 @@ visium_info_to_howto_rela (bfd *abfd, arelent *cache_ptr, break; default: - if (r_type >= (unsigned int) R_VISIUM_max) + if (r_type >= ARRAY_SIZE (visium_elf_howto_table)) { /* xgettext:c-format */ _bfd_error_handler (_("%pB: unsupported relocation type %#x"), abfd, r_type); bfd_set_error (bfd_error_bad_value); - return FALSE; + return false; } cache_ptr->howto = &visium_elf_howto_table[r_type]; break; } - return TRUE; + return true; } /* Look through the relocs for a section during the first phase. Since we don't do .gots or .plts, we just need to consider the virtual table relocs for gc. */ -static bfd_boolean +static bool visium_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, const Elf_Internal_Rela *relocs) { @@ -503,7 +503,7 @@ visium_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, const Elf_Internal_Rela *rel_end; if (bfd_link_relocatable (info)) - return TRUE; + return true; symtab_hdr = &elf_tdata (abfd)->symtab_hdr; sym_hashes = elf_sym_hashes (abfd); @@ -531,24 +531,24 @@ visium_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, Reconstruct it for later use during GC. */ case R_VISIUM_GNU_VTINHERIT: if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset)) - return FALSE; + return false; break; /* This relocation describes which C++ vtable entries are actually used. Record for later use during GC. */ case R_VISIUM_GNU_VTENTRY: if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend)) - return FALSE; + return false; break; } } - return TRUE; + return true; } /* Relocate a VISIUM ELF section. */ -static bfd_boolean +static int visium_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, bfd *input_bfd, asection *input_section, bfd_byte *contents, @@ -599,12 +599,12 @@ visium_elf_relocate_section (bfd *output_bfd, name = bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link, sym->st_name); - name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name; + name = name == NULL ? bfd_section_name (sec) : name; } else { - bfd_boolean unresolved_reloc; - bfd_boolean warned, ignored; + bool unresolved_reloc; + bool warned, ignored; RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel, r_symndx, symtab_hdr, sym_hashes, @@ -620,7 +620,7 @@ visium_elf_relocate_section (bfd *output_bfd, or sections discarded by a linker script, we just want the section contents zeroed. Avoid any special processing. */ _bfd_clear_contents (howto, input_bfd, input_section, - contents + rel->r_offset); + contents, rel->r_offset); rel->r_info = 0; rel->r_addend = 0; @@ -673,7 +673,7 @@ visium_elf_relocate_section (bfd *output_bfd, case bfd_reloc_undefined: (*info->callbacks->undefined_symbol) - (info, name, input_bfd, input_section, rel->r_offset, TRUE); + (info, name, input_bfd, input_section, rel->r_offset, true); break; case bfd_reloc_outofrange: @@ -699,7 +699,7 @@ visium_elf_relocate_section (bfd *output_bfd, } } - return TRUE; + return true; } /* This function is called during section gc to discover the section a @@ -722,51 +722,55 @@ visium_elf_gc_mark_hook (asection *sec, struct bfd_link_info *info, return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym); } -static void -visium_elf_post_process_headers (bfd *abfd, - struct bfd_link_info *info ATTRIBUTE_UNUSED) +static bool +visium_elf_init_file_header (bfd *abfd, struct bfd_link_info *info) { - Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd); - i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_STANDALONE; + Elf_Internal_Ehdr *i_ehdrp; + + if (!_bfd_elf_init_file_header (abfd, info)) + return false; + + i_ehdrp = elf_elfheader (abfd); i_ehdrp->e_ident[EI_ABIVERSION] = 1; + return true; } /* Function to set the ELF flag bits. */ -static bfd_boolean +static bool visium_elf_set_private_flags (bfd *abfd, flagword flags) { elf_elfheader (abfd)->e_flags = flags; - elf_flags_init (abfd) = TRUE; - return TRUE; + elf_flags_init (abfd) = true; + return true; } /* Copy backend specific data from one object module to another. */ -static bfd_boolean +static bool visium_elf_copy_private_bfd_data (bfd *ibfd, bfd *obfd) { if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) - return TRUE; + return true; BFD_ASSERT (!elf_flags_init (obfd) || elf_elfheader (obfd)->e_flags == elf_elfheader (ibfd)->e_flags); elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags; - elf_flags_init (obfd) = TRUE; + elf_flags_init (obfd) = true; /* Copy object attributes. */ _bfd_elf_copy_obj_attributes (ibfd, obfd); - return TRUE; + return true; } /* Merge backend specific data from an object file to the output object file when linking. */ -static bfd_boolean +static bool visium_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { bfd *obfd = info->output_bfd; @@ -788,7 +792,7 @@ visium_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) if (!elf_flags_init (obfd)) { /* First call, no flags set. */ - elf_flags_init (obfd) = TRUE; + elf_flags_init (obfd) = true; elf_elfheader (obfd)->e_flags = new_flags; } else @@ -822,10 +826,10 @@ visium_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) ibfd, new_opt_with, opt_arch, old_opt_with, opt_arch); } - return TRUE; + return true; } -static bfd_boolean +static bool visium_elf_print_private_bfd_data (bfd *abfd, void *ptr) { FILE *file = (FILE *) ptr; @@ -847,11 +851,12 @@ visium_elf_print_private_bfd_data (bfd *abfd, void *ptr) fprintf (file, " -mtune=mcm24"); fputc ('\n', file); - return TRUE; + return true; } #define ELF_ARCH bfd_arch_visium #define ELF_MACHINE_CODE EM_VISIUM +#define ELF_OSABI ELFOSABI_STANDALONE #define ELF_MAXPAGESIZE 1 #define TARGET_BIG_SYM visium_elf32_vec @@ -873,6 +878,6 @@ visium_elf_print_private_bfd_data (bfd *abfd, void *ptr) #define bfd_elf32_bfd_copy_private_bfd_data visium_elf_copy_private_bfd_data #define bfd_elf32_bfd_merge_private_bfd_data visium_elf_merge_private_bfd_data #define bfd_elf32_bfd_print_private_bfd_data visium_elf_print_private_bfd_data -#define elf_backend_post_process_headers visium_elf_post_process_headers +#define elf_backend_init_file_header visium_elf_init_file_header #include "elf32-target.h"