6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-10-30 16:17:05 +00:00
Code Issues Projects Releases Wiki Activity

Support printing relocations in files with no section table.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@242998 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2015-07-23 09:11:05 +00:00
parent 7528c1963f
commit 2b11aef2f4
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/Object/Inputs/rel-no-sec-table.elf-x86-64 Executable file
View File

Binary file not shown.

12
test/Object/relocation-executable.test
View File

@@ -35,3 +35,15 @@ RUN: %p/Inputs/hello-world.elf-x86-64 | FileCheck %s --check-prefix=DYN
// DYN-NEXT: Addend: 0x0
// DYN-NEXT: }
// DYN-NEXT: }
RUN: llvm-readobj -dyn-relocations -expand-relocs \
RUN: %p/Inputs/rel-no-sec-table.elf-x86-64 | FileCheck %s --check-prefix=DYN2
// DYN2: Dynamic Relocations {
// DYN2-NEXT: Relocation {
// DYN2-NEXT: Offset: 0x12F0
// DYN2-NEXT: Type: R_X86_64_GLOB_DAT (6)
// DYN2-NEXT: Symbol: g
// DYN2-NEXT: Addend: 0x0
// DYN2-NEXT: }
// DYN2-NEXT: }

13
tools/llvm-readobj/ELFDumper.cpp
View File

@@ -110,6 +110,7 @@ private:
DynRegionInfo DynRelaRegion;
DynRegionInfo DynamicRegion;
StringRef DynamicStringTable;
const Elf_Sym *DynSymStart = nullptr;
StringRef SOName;
const Elf_Hash *HashTable = nullptr;
};
@@ -660,6 +661,10 @@ ELFDumper<ELFT>::ELFDumper(const ELFFile<ELFT> *Obj, StreamWriter &Writer)
case ELF::DT_STRSZ:
StringTableSize = Dyn.getVal();
break;
case ELF::DT_SYMTAB:
DynSymStart =
reinterpret_cast<const Elf_Sym *>(toMappedAddr(Dyn.getPtr()));
break;
}
}
if (StringTableBegin)
@@ -837,7 +842,7 @@ void ELFDumper<ELFT>::printDynamicRelocations() {
Obj->getRelocationTypeName(Rel.getType(Obj->isMips64EL()), RelocName);
StringRef SymbolName;
uint32_t SymIndex = Rel.getSymbol(Obj->isMips64EL());
const Elf_Sym *Sym = Obj->dynamic_symbol_begin() + SymIndex;
const Elf_Sym *Sym = DynSymStart + SymIndex;
SymbolName = errorOrDefault(Sym->getName(DynamicStringTable));
if (opts::ExpandRelocs) {
DictScope Group(W, "Relocation");
@@ -931,7 +936,7 @@ void ELFDumper<ELFT>::printDynamicSymbols() {
ErrorOr<StringRef> StrTableOrErr = Obj->getStringTableForSymtab(*Symtab);
error(StrTableOrErr.getError());
StringRef StrTable = *StrTableOrErr;
for (const Elf_Sym &Sym : Obj->dynamic_symbols())
for (const Elf_Sym &Sym : Obj->symbols(Symtab))
printSymbol(&Sym, StrTable, true);
}
@@ -1431,8 +1436,8 @@ template <class ELFT> void MipsGOTParser<ELFT>::parseGOT() {
const Elf_Shdr *DynSymSec = Obj->getDotDynSymSec();
ErrorOr<StringRef> StrTable = Obj->getStringTableForSymtab(*DynSymSec);
error(StrTable.getError());
const Elf_Sym *DynSymBegin = Obj->dynamic_symbol_begin();
const Elf_Sym *DynSymEnd = Obj->dynamic_symbol_end();
const Elf_Sym *DynSymBegin = Obj->symbol_begin(DynSymSec);
const Elf_Sym *DynSymEnd = Obj->symbol_end(DynSymSec);
std::size_t DynSymTotal = std::size_t(std::distance(DynSymBegin, DynSymEnd));
if (*DtGotSym > DynSymTotal) {