summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-readobj/ELFDumper.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2015-07-21 19:57:43 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2015-07-21 19:57:43 +0000
commit3a0b1dc800cf46a0237a7455272e7d11dfac1757 (patch)
treeaa268f299364a848b216f68b4396012bd8a03831 /llvm/tools/llvm-readobj/ELFDumper.cpp
parentc7b0ee2c8767a37410b9970d112bb2c172d8c357 (diff)
downloadbcm5719-llvm-3a0b1dc800cf46a0237a7455272e7d11dfac1757.tar.gz
bcm5719-llvm-3a0b1dc800cf46a0237a7455272e7d11dfac1757.zip
Make printValue a member function.
We were already passing 3 values it can get from ELFDumper. llvm-svn: 242829
Diffstat (limited to 'llvm/tools/llvm-readobj/ELFDumper.cpp')
-rw-r--r--llvm/tools/llvm-readobj/ELFDumper.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index 44df3a8def5..787b485972a 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -75,6 +75,7 @@ private:
void printRelocations(const Elf_Shdr *Sec);
void printRelocation(const Elf_Shdr *Sec, typename ELFO::Elf_Rela Rel);
+ void printValue(uint64_t Type, uint64_t Value);
const ELFO *Obj;
};
@@ -967,8 +968,8 @@ static const char *getDynamicString(const ELFFile<ELFT> &O, uint64_t Value) {
}
template <class ELFT>
-static void printValue(const ELFFile<ELFT> *O, uint64_t Type, uint64_t Value,
- bool Is64, raw_ostream &OS) {
+void ELFDumper<ELFT>::printValue(uint64_t Type, uint64_t Value) {
+ raw_ostream &OS = W.getOStream();
switch (Type) {
case DT_PLTREL:
if (Value == DT_REL) {
@@ -1024,14 +1025,14 @@ static void printValue(const ELFFile<ELFT> *O, uint64_t Type, uint64_t Value,
OS << Value << " (bytes)";
break;
case DT_NEEDED:
- OS << "SharedLibrary (" << getDynamicString(*O, Value) << ")";
+ OS << "SharedLibrary (" << getDynamicString(*Obj, Value) << ")";
break;
case DT_SONAME:
- OS << "LibrarySoname (" << getDynamicString(*O, Value) << ")";
+ OS << "LibrarySoname (" << getDynamicString(*Obj, Value) << ")";
break;
case DT_RPATH:
case DT_RUNPATH:
- OS << getDynamicString(*O, Value);
+ OS << getDynamicString(*Obj, Value);
break;
case DT_MIPS_FLAGS:
printFlags(Value, makeArrayRef(ElfDynamicDTMipsFlags), OS);
@@ -1098,7 +1099,7 @@ void ELFDumper<ELFT>::printDynamicTable() {
<< " "
<< format(Is64 ? "0x%016" PRIX64 : "0x%08" PRIX64, Entry.getTag())
<< " " << format("%-21s", getTypeString(Entry.getTag()));
- printValue(Obj, Entry.getTag(), Entry.getVal(), Is64, OS);
+ printValue(Entry.getTag(), Entry.getVal());
OS << "\n";
}
OpenPOWER on IntegriCloud