RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00
Code Issues Projects Releases Wiki Activity

[llvm-readobj] - Remove code duplication when printing dynamic relocations. NFCI.

Browse Source 
LLVM style code can be simplified to avoid the duplication of logic
related to printing dynamic relocations.

Differential revision: https://reviews.llvm.org/D87089
This commit is contained in:
Georgii Rymar 2020-09-07 15:52:51 +03:00
parent cc18f8d9f8
commit cebe3f34e6
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -960,6 +960,7 @@ private:
void printRelrReloc(const Elf_Relr &R) override;
void printDynamicReloc(const Relocation<ELFT> &R) override;
void printRelRelaReloc(const Relocation<ELFT> &R, StringRef SymbolName);
void printSymbols();
void printDynamicSymbols();
void printSymbolSection(const Elf_Sym *Symbol, const Elf_Sym *First);
@ -6156,7 +6157,12 @@ void LLVMStyle<ELFT>::printReloc(const Relocation<ELFT> &R, unsigned RelIndex,
return;
}
std::string TargetName = Target->Name;
printRelRelaReloc(R, Target->Name);
}
template <class ELFT>
void LLVMStyle<ELFT>::printRelRelaReloc(const Relocation<ELFT> &R,
StringRef SymbolName) {
SmallString<32> RelocName;
this->Obj.getRelocationTypeName(R.Type, RelocName);
@ -6165,12 +6171,12 @@ void LLVMStyle<ELFT>::printReloc(const Relocation<ELFT> &R, unsigned RelIndex,
DictScope Group(W, "Relocation");
W.printHex("Offset", R.Offset);
W.printNumber("Type", RelocName, R.Type);
W.printNumber("Symbol", !TargetName.empty() ? TargetName : "-", R.Symbol);
W.printNumber("Symbol", !SymbolName.empty() ? SymbolName : "-", R.Symbol);
W.printHex("Addend", Addend);
} else {
raw_ostream &OS = W.startLine();
OS << W.hex(R.Offset) << " " << RelocName << " "
<< (!TargetName.empty() ? TargetName : "-") << " " << W.hex(Addend)
<< (!SymbolName.empty() ? SymbolName : "-") << " " << W.hex(Addend)
<< "\n";
}
}
@ -6362,24 +6368,9 @@ template <class ELFT> void LLVMStyle<ELFT>::printDynamicRelocations() {
template <class ELFT>
void LLVMStyle<ELFT>::printDynamicReloc(const Relocation<ELFT> &R) {
SmallString<32> RelocName;
this->Obj.getRelocationTypeName(R.Type, RelocName);
std::string SymbolName =
getSymbolForReloc(this->Obj, this->FileName, this->dumper(), R).Name;
uintX_t Addend = R.Addend.getValueOr(0);
if (opts::ExpandRelocs) {
DictScope Group(W, "Relocation");
W.printHex("Offset", R.Offset);
W.printNumber("Type", RelocName, R.Type);
W.printString("Symbol", !SymbolName.empty() ? SymbolName : "-");
W.printHex("Addend", Addend);
} else {
raw_ostream &OS = W.startLine();
OS << W.hex(R.Offset) << " " << RelocName << " "
<< (!SymbolName.empty() ? SymbolName : "-") << " " << W.hex(Addend)
<< "\n";
}
RelSymbol<ELFT> S =
getSymbolForReloc(this->Obj, this->FileName, this->dumper(), R);
printRelRelaReloc(R, S.Name);
}
template <class ELFT>