[llvm-readobj] Implement GNU-style output for dynamic table
GNU readelf tool prints slightly different dynamic table "header" and
surrounds dynamic tag names by brackets. This patch implements the same
formatting for GNU-style output of the `llvm-readobj`.
LLVM
```
DynamicSection [ (13 entries)
Tag Type Name/Value
0x00000006 SYMTAB 0x168
...
]
```
GNU
```
Dynamic section at offset 0x1d0 contains 13 entries:
Tag Type Name/Value
0x00000006 (SYMTAB) 0x168
...
```
Differential Revision: https://reviews.llvm.org/D62256
llvm-svn: 361633
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index 159e300..48dd47d 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -206,8 +206,6 @@
void loadDynamicTable(const ELFFile<ELFT> *Obj);
void parseDynamicTable();
- void printValue(uint64_t Type, uint64_t Value);
-
StringRef getDynamicString(uint64_t Offset) const;
StringRef getSymbolVersion(StringRef StrTab, const Elf_Sym *symb,
bool &IsDefault) const;
@@ -262,7 +260,18 @@
public:
Elf_Dyn_Range dynamic_table() const {
- return DynamicTable.getAsArrayRef<Elf_Dyn>();
+ // A valid .dynamic section contains an array of entries terminated
+ // with a DT_NULL entry. However, sometimes the section content may
+ // continue past the DT_NULL entry, so to dump the section correctly,
+ // we first find the end of the entries by iterating over them.
+ Elf_Dyn_Range Table = DynamicTable.getAsArrayRef<Elf_Dyn>();
+
+ size_t Size = 0;
+ while (Size < Table.size())
+ if (Table[Size++].getTag() == DT_NULL)
+ break;
+
+ return Table.slice(0, Size);
}
Elf_Sym_Range dynamic_symbols() const {
@@ -283,6 +292,8 @@
bool &IsDefault) const;
void printSymbolsHelper(bool IsDynamic) const;
+ void printDynamicEntry(raw_ostream &OS, uint64_t Type, uint64_t Value) const;
+
const Elf_Shdr *getDotSymtabSec() const { return DotSymtabSec; }
const Elf_Shdr *getDotCGProfileSec() const { return DotCGProfileSec; }
const Elf_Shdr *getDotAddrsigSec() const { return DotAddrsigSec; }
@@ -292,6 +303,7 @@
const DynRegionInfo &getDynRelaRegion() const { return DynRelaRegion; }
const DynRegionInfo &getDynRelrRegion() const { return DynRelrRegion; }
const DynRegionInfo &getDynPLTRelRegion() const { return DynPLTRelRegion; }
+ const DynRegionInfo &getDynamicTableRegion() const { return DynamicTable; }
const Elf_Hash *getHashTable() const { return HashTable; }
const Elf_GnuHash *getGnuHashTable() const { return GnuHashTable; }
};
@@ -340,6 +352,7 @@
virtual void printSymbols(const ELFFile<ELFT> *Obj, bool PrintSymbols,
bool PrintDynamicSymbols) = 0;
virtual void printHashSymbols(const ELFFile<ELFT> *Obj) {}
+ virtual void printDynamic(const ELFFile<ELFT> *Obj) {}
virtual void printDynamicRelocations(const ELFFile<ELFT> *Obj) = 0;
virtual void printSymtabMessage(const ELFFile<ELFT> *Obj, StringRef Name,
size_t Offset) {}
@@ -384,6 +397,7 @@
void printSymbols(const ELFO *Obj, bool PrintSymbols,
bool PrintDynamicSymbols) override;
void printHashSymbols(const ELFO *Obj) override;
+ void printDynamic(const ELFFile<ELFT> *Obj) override;
void printDynamicRelocations(const ELFO *Obj) override;
void printSymtabMessage(const ELFO *Obj, StringRef Name,
size_t Offset) override;
@@ -488,6 +502,7 @@
void printSectionHeaders(const ELFO *Obj) override;
void printSymbols(const ELFO *Obj, bool PrintSymbols,
bool PrintDynamicSymbols) override;
+ void printDynamic(const ELFFile<ELFT> *Obj) override;
void printDynamicRelocations(const ELFO *Obj) override;
void printProgramHeaders(const ELFO *Obj, bool PrintProgramHeaders,
cl::boolOrDefault PrintSectionMapping) override;
@@ -1764,8 +1779,8 @@
}
template <class ELFT>
-void ELFDumper<ELFT>::printValue(uint64_t Type, uint64_t Value) {
- raw_ostream &OS = W.getOStream();
+void ELFDumper<ELFT>::printDynamicEntry(raw_ostream &OS, uint64_t Type,
+ uint64_t Value) const {
const char *ConvChar =
(opts::Output == opts::GNU) ? "0x%" PRIx64 : "0x%" PRIX64;
switch (Type) {
@@ -1883,41 +1898,7 @@
} // end anonymous namespace
template <class ELFT> void ELFDumper<ELFT>::printDynamicTable() {
- // A valid .dynamic section contains an array of entries terminated with
- // a DT_NULL entry. However, sometimes the section content may continue
- // past the DT_NULL entry, so to dump the section correctly, we first find
- // the end of the entries by iterating over them.
- size_t Size = 0;
- Elf_Dyn_Range DynTableEntries = dynamic_table();
- for (; Size < DynTableEntries.size();)
- if (DynTableEntries[Size++].getTag() == DT_NULL)
- break;
-
- if (!Size)
- return;
-
- raw_ostream &OS = W.getOStream();
- W.startLine() << "DynamicSection [ (" << Size << " entries)\n";
-
- bool Is64 = ELFT::Is64Bits;
- W.startLine() << " Tag" << (Is64 ? " " : " ") << "Type"
- << " "
- << "Name/Value\n";
- for (size_t I = 0; I < Size; ++I) {
- const Elf_Dyn &Entry = DynTableEntries[I];
- uintX_t Tag = Entry.getTag();
- W.startLine() << " "
- << format_hex(Tag, Is64 ? 18 : 10, opts::Output != opts::GNU)
- << " "
- << format(
- "%-21s",
- getTypeString(
- ObjF->getELFFile()->getHeader()->e_machine, Tag));
- printValue(Tag, Entry.getVal());
- OS << "\n";
- }
-
- W.startLine() << "]\n";
+ ELFDumperStyle->printDynamic(ObjF->getELFFile());
}
template <class ELFT> void ELFDumper<ELFT>::printNeededLibraries() {
@@ -3344,6 +3325,35 @@
printRelocation(Obj, Sym, SymbolName, R, IsRela);
}
+template <class ELFT> void GNUStyle<ELFT>::printDynamic(const ELFO *Obj) {
+ Elf_Dyn_Range Table = this->dumper()->dynamic_table();
+ if (Table.empty())
+ return;
+
+ const DynRegionInfo &DynamicTableRegion =
+ this->dumper()->getDynamicTableRegion();
+
+ OS << "Dynamic section at offset "
+ << format_hex(reinterpret_cast<const uint8_t *>(DynamicTableRegion.Addr) -
+ Obj->base(),
+ 1)
+ << " contains " << Table.size() << " entries:\n";
+
+ bool Is64 = ELFT::Is64Bits;
+ if (Is64)
+ OS << " Tag Type Name/Value\n";
+ else
+ OS << " Tag Type Name/Value\n";
+ for (auto Entry : Table) {
+ uintX_t Tag = Entry.getTag();
+ std::string TypeString = getTypeString(Obj->getHeader()->e_machine, Tag);
+ OS << format(" 0x%0*x %-20s ", Is64 ? 16 : 8, Tag,
+ ("(" + TypeString + ")").c_str());
+ this->dumper()->printDynamicEntry(OS, Tag, Entry.getVal());
+ OS << "\n";
+ }
+}
+
template <class ELFT>
void GNUStyle<ELFT>::printDynamicRelocations(const ELFO *Obj) {
const DynRegionInfo &DynRelRegion = this->dumper()->getDynRelRegion();
@@ -4502,6 +4512,31 @@
this->dumper()->printSymbolsHelper(true);
}
+template <class ELFT> void LLVMStyle<ELFT>::printDynamic(const ELFFile<ELFT> *Obj) {
+ Elf_Dyn_Range Table = this->dumper()->dynamic_table();
+ if (Table.empty())
+ return;
+
+ raw_ostream &OS = W.getOStream();
+ W.startLine() << "DynamicSection [ (" << Table.size() << " entries)\n";
+
+ bool Is64 = ELFT::Is64Bits;
+ if (Is64)
+ W.startLine() << " Tag Type Name/Value\n";
+ else
+ W.startLine() << " Tag Type Name/Value\n";
+ for (auto Entry : Table) {
+ uintX_t Tag = Entry.getTag();
+ W.startLine() << " " << format_hex(Tag, Is64 ? 18 : 10, true) << " "
+ << format("%-21s",
+ getTypeString(Obj->getHeader()->e_machine, Tag));
+ this->dumper()->printDynamicEntry(OS, Tag, Entry.getVal());
+ OS << "\n";
+ }
+
+ W.startLine() << "]\n";
+}
+
template <class ELFT>
void LLVMStyle<ELFT>::printDynamicRelocations(const ELFO *Obj) {
const DynRegionInfo &DynRelRegion = this->dumper()->getDynRelRegion();