forked from Imagelibrary/binutils-gdb
Refactor gold to enable support for MIPS-64 relocation format.
For MIPS-64, the r_info field in the relocation format is replaced by several individual fields, including r_sym and r_type. To enable support for this format, I've refactored target-independent code to remove almost all uses of the r_info field. (I've left alone a couple of routines used only for incremental linking, which I can update if/when the MIPS target adds support for incremental linking.) For routines that are already templated on a Classify_reloc class (namely, gc_process_relocs, relocate_section, and relocate_relocs), I've extended the Classify_reloc interface to include sh_type (which no longer needs to be a separate template parameter) as well as get_r_sym() and get_r_type() methods for extracting the r_sym and r_type fields. For scan_relocatable_relocs, I've extended the Default_scan_relocatable_relocs class by converting it to a class template with Classify_reloc as a template parameter. For the remaining routines that need to access r_sym, I've added a virtual Target::get_r_sym() method with an override for the MIPS target. In elfcpp, I've added Mips64_rel, etc., accessor classes and corresponding internal data structures. The MIPS target uses these new classes within its own Mips_classify_reloc class. The Mips64_ accessor classes also expose the r_ssym, r_type2, and r_type3 fields from the relocation. These changes should be functionally the same for all but the MIPS target. elfcpp/ * elfcpp.h (Mips64_rel, Mips64_rel_write): New classes. (Mips64_rela, Mips64_rela_write): New classes. * elfcpp_internal.h (Mips64_rel_data, Mips64_rela_data): New structs. gold/ * gc.h (get_embedded_addend_size): Remove sh_type parameter. (gc_process_relocs): Remove sh_type template parameter. Use Classify_reloc to access r_sym, r_type, and r_addend fields. * object.h (Sized_relobj_file::split_stack_adjust): Add target parameter. (Sized_relobj_file::split_stack_adjust_reltype): Likewise. * reloc-types.h (Reloc_types::copy_reloc_addend): (SHT_REL and SHT_RELA specializations) Remove. * reloc.cc (Emit_relocs_strategy): Rename and move to target-reloc.h. (Sized_relobj_file::emit_relocs_scan): Call Target::emit_relocs_scan(). (Sized_relobj_file::emit_relocs_scan_reltype): Remove. (Sized_relobj_file::split_stack_adjust): Add target parameter. Adjust all callers. (Sized_relobj_file::split_stack_adjust_reltype): Likewise. Call Target::get_r_sym() to get r_sym field from relocations. (Track_relocs::next_symndx): Call Target::get_r_sym(). * target-reloc.h (scan_relocs): Remove sh_type template parameter; add Classify_reloc template parameter. Use for accessing r_sym and r_type. (relocate_section): Likewise. (Default_classify_reloc): New class (renamed and moved from reloc.cc). (Default_scan_relocatable_relocs): Remove sh_type template parameter. (Default_scan_relocatable_relocs::Reltype): New typedef. (Default_scan_relocatable_relocs::reloc_size): New const. (Default_scan_relocatable_relocs::sh_type): New const. (Default_scan_relocatable_relocs::get_r_sym): New method. (Default_scan_relocatable_relocs::get_r_type): New method. (Default_emit_relocs_strategy): New class. (scan_relocatable_relocs): Replace sh_type template parameter with Scan_relocatable_relocs class. Use it to access r_sym and r_type fields. (relocate_relocs): Replace sh_type template parameter with Classify_reloc class. Use it to access r_sym and r_type fields. * target.h (Target::is_call_to_non_split): Replace r_type parameter with pointer to relocation. Adjust all callers. (Target::do_is_call_to_non_split): Likewise. (Target::emit_relocs_scan): New virtual method. (Sized_target::get_r_sym): New virtual method. * target.cc (Target::do_is_call_to_non_split): Replace r_type parameter with pointer to relocation. * aarch64.cc (Target_aarch64::emit_relocs_scan): New method. (Target_aarch64::Relocatable_size_for_reloc): Remove. (Target_aarch64::gc_process_relocs): Use Default_classify_reloc. (Target_aarch64::scan_relocs): Likewise. (Target_aarch64::relocate_section): Likewise. (Target_aarch64::Relocatable_size_for_reloc::get_size_for_reloc): Remove. (Target_aarch64::scan_relocatable_relocs): Use Default_classify_reloc. (Target_aarch64::relocate_relocs): Use Default_classify_reloc. * arm.cc (Target_arm::Arm_scan_relocatable_relocs): Remove sh_type template parameter. (Target_arm::emit_relocs_scan): New method. (Target_arm::Relocatable_size_for_reloc): Replace with... (Target_arm::Classify_reloc): ...this. (Target_arm::gc_process_relocs): Use Classify_reloc. (Target_arm::scan_relocs): Likewise. (Target_arm::relocate_section): Likewise. (Target_arm::scan_relocatable_relocs): Likewise. (Target_arm::relocate_relocs): Likewise. * i386.cc (Target_i386::emit_relocs_scan): New method. (Target_i386::Relocatable_size_for_reloc): Replace with... (Target_i386::Classify_reloc): ...this. (Target_i386::gc_process_relocs): Use Classify_reloc. (Target_i386::scan_relocs): Likewise. (Target_i386::relocate_section): Likewise. (Target_i386::scan_relocatable_relocs): Likewise. (Target_i386::relocate_relocs): Likewise. * mips.cc (Mips_scan_relocatable_relocs): Remove sh_type template parameter. (Mips_reloc_types): New class template. (Mips_classify_reloc): New class template. (Target_mips::Reltype): New typedef. (Target_mips::Relatype): New typedef. (Target_mips::emit_relocs_scan): New method. (Target_mips::get_r_sym): New method. (Target_mips::Relocatable_size_for_reloc): Replace with Mips_classify_reloc. (Target_mips::copy_reloc): Use Mips_classify_reloc. (Target_mips::gc_process_relocs): Likewise. (Target_mips::scan_relocs): Likewise. (Target_mips::relocate_section): Likewise. (Target_mips::scan_relocatable_relocs): Likewise. (Target_mips::relocate_relocs): Likewise. (mips_get_size_for_reloc): New function, factored out from Relocatable_size_for_reloc::get_size_for_reloc. (Target_mips::Scan::local): Use Mips_classify_reloc. (Target_mips::Scan::global): Likewise. (Target_mips::Relocate::relocate): Likewise. * powerpc.cc (Target_powerpc::emit_relocs_scan): New method. (Target_powerpc::Relocatable_size_for_reloc): Remove. (Target_powerpc::gc_process_relocs): Use Default_classify_reloc. (Target_powerpc::scan_relocs): Likewise. (Target_powerpc::relocate_section): Likewise. (Powerpc_scan_relocatable_reloc): Convert to class template. (Powerpc_scan_relocatable_reloc::Reltype): New typedef. (Powerpc_scan_relocatable_reloc::reloc_size): New const. (Powerpc_scan_relocatable_reloc::sh_type): New const. (Powerpc_scan_relocatable_reloc::get_r_sym): New method. (Powerpc_scan_relocatable_reloc::get_r_type): New method. (Target_powerpc::scan_relocatable_relocs): Use Powerpc_scan_relocatable_reloc. (Target_powerpc::relocate_relocs): Use Default_classify_reloc. * s390.cc (Target_s390::emit_relocs_scan): New method. (Target_s390::Relocatable_size_for_reloc): Remove. (Target_s390::gc_process_relocs): Use Default_classify_reloc. (Target_s390::scan_relocs): Likewise. (Target_s390::relocate_section): Likewise. (Target_s390::Relocatable_size_for_reloc::get_size_for_reloc): Remove. (Target_s390::scan_relocatable_relocs): Use Default_classify_reloc. (Target_s390::relocate_relocs): Use Default_classify_reloc. * sparc.cc (Target_sparc::emit_relocs_scan): New method. (Target_sparc::Relocatable_size_for_reloc): Remove. (Target_sparc::gc_process_relocs): Use Default_classify_reloc. (Target_sparc::scan_relocs): Likewise. (Target_sparc::relocate_section): Likewise. (Target_sparc::Relocatable_size_for_reloc::get_size_for_reloc): Remove. (Target_sparc::scan_relocatable_relocs): Use Default_classify_reloc. (Target_sparc::relocate_relocs): Use Default_classify_reloc. * tilegx.cc (Target_tilegx::emit_relocs_scan): New method. (Target_tilegx::Relocatable_size_for_reloc): Remove. (Target_tilegx::gc_process_relocs): Use Default_classify_reloc. (Target_tilegx::scan_relocs): Likewise. (Target_tilegx::relocate_section): Likewise. (Target_tilegx::Relocatable_size_for_reloc::get_size_for_reloc): Remove. (Target_tilegx::scan_relocatable_relocs): Use Default_classify_reloc. (Target_tilegx::relocate_relocs): Use Default_classify_reloc. * x86_64.cc (Target_x86_64::emit_relocs_scan): New method. (Target_x86_64::Relocatable_size_for_reloc): Remove. (Target_x86_64::gc_process_relocs): Use Default_classify_reloc. (Target_x86_64::scan_relocs): Likewise. (Target_x86_64::relocate_section): Likewise. (Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc): Remove. (Target_x86_64::scan_relocatable_relocs): Use Default_classify_reloc. (Target_x86_64::relocate_relocs): Use Default_classify_reloc. * testsuite/testfile.cc (Target_test::emit_relocs_scan): New method.
This commit is contained in:
Cary Coutant
112
gold/reloc.cc
112
gold/reloc.cc
@@ -424,8 +424,8 @@ Sized_relobj_file<size, big_endian>::do_gc_process_relocs(Symbol_table* symtab,
|
||||
template<int size, bool big_endian>
|
||||
void
|
||||
Sized_relobj_file<size, big_endian>::do_scan_relocs(Symbol_table* symtab,
|
||||
Layout* layout,
|
||||
Read_relocs_data* rd)
|
||||
Layout* layout,
|
||||
Read_relocs_data* rd)
|
||||
{
|
||||
Sized_target<size, big_endian>* target =
|
||||
parameters->sized_target<size, big_endian>();
|
||||
@@ -501,41 +501,6 @@ Sized_relobj_file<size, big_endian>::do_scan_relocs(Symbol_table* symtab,
|
||||
}
|
||||
}
|
||||
|
||||
// This is a strategy class we use when scanning for --emit-relocs.
|
||||
|
||||
template<int sh_type>
|
||||
class Emit_relocs_strategy
|
||||
{
|
||||
public:
|
||||
// A local non-section symbol.
|
||||
inline Relocatable_relocs::Reloc_strategy
|
||||
local_non_section_strategy(unsigned int, Relobj*, unsigned int)
|
||||
{ return Relocatable_relocs::RELOC_COPY; }
|
||||
|
||||
// A local section symbol.
|
||||
inline Relocatable_relocs::Reloc_strategy
|
||||
local_section_strategy(unsigned int, Relobj*)
|
||||
{
|
||||
if (sh_type == elfcpp::SHT_RELA)
|
||||
return Relocatable_relocs::RELOC_ADJUST_FOR_SECTION_RELA;
|
||||
else
|
||||
{
|
||||
// The addend is stored in the section contents. Since this
|
||||
// is not a relocatable link, we are going to apply the
|
||||
// relocation contents to the section as usual. This means
|
||||
// that we have no way to record the original addend. If the
|
||||
// original addend is not zero, there is basically no way for
|
||||
// the user to handle this correctly. Caveat emptor.
|
||||
return Relocatable_relocs::RELOC_ADJUST_FOR_SECTION_0;
|
||||
}
|
||||
}
|
||||
|
||||
// A global symbol.
|
||||
inline Relocatable_relocs::Reloc_strategy
|
||||
global_strategy(unsigned int, Relobj*, unsigned int)
|
||||
{ return Relocatable_relocs::RELOC_COPY; }
|
||||
};
|
||||
|
||||
// Scan the input relocations for --emit-relocs.
|
||||
|
||||
template<int size, bool big_endian>
|
||||
@@ -546,40 +511,18 @@ Sized_relobj_file<size, big_endian>::emit_relocs_scan(
|
||||
const unsigned char* plocal_syms,
|
||||
const Read_relocs_data::Relocs_list::iterator& p)
|
||||
{
|
||||
Sized_target<size, big_endian>* target =
|
||||
parameters->sized_target<size, big_endian>();
|
||||
|
||||
Relocatable_relocs* rr = this->relocatable_relocs(p->reloc_shndx);
|
||||
gold_assert(rr != NULL);
|
||||
rr->set_reloc_count(p->reloc_count);
|
||||
|
||||
if (p->sh_type == elfcpp::SHT_REL)
|
||||
this->emit_relocs_scan_reltype<elfcpp::SHT_REL>(symtab, layout,
|
||||
plocal_syms, p, rr);
|
||||
else
|
||||
{
|
||||
gold_assert(p->sh_type == elfcpp::SHT_RELA);
|
||||
this->emit_relocs_scan_reltype<elfcpp::SHT_RELA>(symtab, layout,
|
||||
plocal_syms, p, rr);
|
||||
}
|
||||
}
|
||||
|
||||
// Scan the input relocation for --emit-relocs, templatized on the
|
||||
// type of the relocation section.
|
||||
|
||||
template<int size, bool big_endian>
|
||||
template<int sh_type>
|
||||
void
|
||||
Sized_relobj_file<size, big_endian>::emit_relocs_scan_reltype(
|
||||
Symbol_table* symtab,
|
||||
Layout* layout,
|
||||
const unsigned char* plocal_syms,
|
||||
const Read_relocs_data::Relocs_list::iterator& p,
|
||||
Relocatable_relocs* rr)
|
||||
{
|
||||
scan_relocatable_relocs<size, big_endian, sh_type,
|
||||
Emit_relocs_strategy<sh_type> >(
|
||||
target->emit_relocs_scan(
|
||||
symtab,
|
||||
layout,
|
||||
this,
|
||||
p->data_shndx,
|
||||
p->sh_type,
|
||||
p->contents->data(),
|
||||
p->reloc_count,
|
||||
p->output_section,
|
||||
@@ -628,8 +571,8 @@ Sized_relobj_file<size, big_endian>::incremental_relocs_scan_reltype(
|
||||
reloc.get_r_offset()))
|
||||
continue;
|
||||
|
||||
typename elfcpp::Elf_types<size>::Elf_WXword r_info =
|
||||
reloc.get_r_info();
|
||||
// FIXME: Some targets have a non-standard r_info field.
|
||||
typename elfcpp::Elf_types<size>::Elf_WXword r_info = reloc.get_r_info();
|
||||
const unsigned int r_sym = elfcpp::elf_r_sym<size>(r_info);
|
||||
|
||||
if (r_sym >= this->local_symbol_count_)
|
||||
@@ -1025,7 +968,7 @@ Sized_relobj_file<size, big_endian>::do_relocate_sections(
|
||||
if ((data_shdr.get_sh_flags() & elfcpp::SHF_EXECINSTR) != 0)
|
||||
this->split_stack_adjust(symtab, pshdrs, sh_type, index,
|
||||
prelocs, reloc_count, view, view_size,
|
||||
&reloc_map);
|
||||
&reloc_map, target);
|
||||
}
|
||||
|
||||
Relocatable_relocs* rr = NULL;
|
||||
@@ -1142,6 +1085,7 @@ Sized_relobj_file<size, big_endian>::incremental_relocs_write_reltype(
|
||||
{
|
||||
Reloc reloc(prelocs);
|
||||
|
||||
// FIXME: Some targets have a non-standard r_info field.
|
||||
typename elfcpp::Elf_types<size>::Elf_WXword r_info = reloc.get_r_info();
|
||||
const unsigned int r_sym = elfcpp::elf_r_sym<size>(r_info);
|
||||
const unsigned int r_type = elfcpp::elf_r_type<size>(r_info);
|
||||
@@ -1240,20 +1184,21 @@ Sized_relobj_file<size, big_endian>::split_stack_adjust(
|
||||
size_t reloc_count,
|
||||
unsigned char* view,
|
||||
section_size_type view_size,
|
||||
Reloc_symbol_changes** reloc_map)
|
||||
Reloc_symbol_changes** reloc_map,
|
||||
const Sized_target<size, big_endian>* target)
|
||||
{
|
||||
if (sh_type == elfcpp::SHT_REL)
|
||||
this->split_stack_adjust_reltype<elfcpp::SHT_REL>(symtab, pshdrs, shndx,
|
||||
prelocs, reloc_count,
|
||||
view, view_size,
|
||||
reloc_map);
|
||||
reloc_map, target);
|
||||
else
|
||||
{
|
||||
gold_assert(sh_type == elfcpp::SHT_RELA);
|
||||
this->split_stack_adjust_reltype<elfcpp::SHT_RELA>(symtab, pshdrs, shndx,
|
||||
prelocs, reloc_count,
|
||||
view, view_size,
|
||||
reloc_map);
|
||||
reloc_map, target);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1271,7 +1216,8 @@ Sized_relobj_file<size, big_endian>::split_stack_adjust_reltype(
|
||||
size_t reloc_count,
|
||||
unsigned char* view,
|
||||
section_size_type view_size,
|
||||
Reloc_symbol_changes** reloc_map)
|
||||
Reloc_symbol_changes** reloc_map,
|
||||
const Sized_target<size, big_endian>* target)
|
||||
{
|
||||
typedef typename Reloc_types<sh_type, size, big_endian>::Reloc Reltype;
|
||||
const int reloc_size = Reloc_types<sh_type, size, big_endian>::reloc_size;
|
||||
@@ -1283,10 +1229,10 @@ Sized_relobj_file<size, big_endian>::split_stack_adjust_reltype(
|
||||
const unsigned char* pr = prelocs;
|
||||
for (size_t i = 0; i < reloc_count; ++i, pr += reloc_size)
|
||||
{
|
||||
Reltype reloc(pr);
|
||||
|
||||
typename elfcpp::Elf_types<size>::Elf_WXword r_info = reloc.get_r_info();
|
||||
unsigned int r_sym = elfcpp::elf_r_sym<size>(r_info);
|
||||
// Some supported targets have a non-standard r_info field.
|
||||
// If this call is too slow, we can move this routine to
|
||||
// target-reloc.h and templatize it on Classify_reloc.
|
||||
unsigned int r_sym = target->get_r_sym(pr);
|
||||
if (r_sym < local_count)
|
||||
continue;
|
||||
|
||||
@@ -1305,9 +1251,9 @@ Sized_relobj_file<size, big_endian>::split_stack_adjust_reltype(
|
||||
&& gsym->source() == Symbol::FROM_OBJECT
|
||||
&& !gsym->object()->uses_split_stack())
|
||||
{
|
||||
unsigned int r_type = elfcpp::elf_r_type<size>(reloc.get_r_info());
|
||||
if (parameters->target().is_call_to_non_split(gsym, r_type))
|
||||
if (parameters->target().is_call_to_non_split(gsym, pr))
|
||||
{
|
||||
Reltype reloc(pr);
|
||||
section_offset_type offset =
|
||||
convert_to_section_size_type(reloc.get_r_offset());
|
||||
non_split_refs.push_back(offset);
|
||||
@@ -1378,9 +1324,7 @@ Sized_relobj_file<size, big_endian>::split_stack_adjust_reltype(
|
||||
{
|
||||
Reltype reloc(pr);
|
||||
|
||||
typename elfcpp::Elf_types<size>::Elf_WXword r_info =
|
||||
reloc.get_r_info();
|
||||
unsigned int r_sym = elfcpp::elf_r_sym<size>(r_info);
|
||||
unsigned int r_sym = target->get_r_sym(pr);
|
||||
if (r_sym < local_count)
|
||||
continue;
|
||||
|
||||
@@ -1600,11 +1544,9 @@ Track_relocs<size, big_endian>::next_symndx() const
|
||||
{
|
||||
if (this->pos_ >= this->len_)
|
||||
return -1U;
|
||||
|
||||
// Rel and Rela start out the same, so we can use Rel to find the
|
||||
// symbol index.
|
||||
elfcpp::Rel<size, big_endian> rel(this->prelocs_ + this->pos_);
|
||||
return elfcpp::elf_r_sym<size>(rel.get_r_info());
|
||||
Sized_target<size, big_endian>* target
|
||||
= parameters->sized_target<size, big_endian>();
|
||||
return target->get_r_sym(this->prelocs_ + this->pos_);
|
||||
}
|
||||
|
||||
// Return the addend of the next reloc, or 0 if there isn't one.
|
||||
|
||||
Reference in New Issue
Block a user