[llvm] r250291 - [llvm-readobj/ELF] Print GNU Hash section
Igor Kudrin via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 14 05:11:51 PDT 2015
Author: ikudrin
Date: Wed Oct 14 07:11:50 2015
New Revision: 250291
URL: http://llvm.org/viewvc/llvm-project?rev=250291&view=rev
Log:
[llvm-readobj/ELF] Print GNU Hash section
Add a new command line switch, -gnu-hash-table, to print the content of that section.
Differential Revision: http://reviews.llvm.org/D13696
Added:
llvm/trunk/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-i386
llvm/trunk/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-ppc
llvm/trunk/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-ppc64
llvm/trunk/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-x86_64
llvm/trunk/test/tools/llvm-readobj/elf-gnuhash.test
Modified:
llvm/trunk/include/llvm/Object/ELF.h
llvm/trunk/include/llvm/Object/ELFTypes.h
llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
llvm/trunk/tools/llvm-readobj/ObjDumper.h
llvm/trunk/tools/llvm-readobj/StreamWriter.h
llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp
Modified: llvm/trunk/include/llvm/Object/ELF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELF.h?rev=250291&r1=250290&r2=250291&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/ELF.h (original)
+++ llvm/trunk/include/llvm/Object/ELF.h Wed Oct 14 07:11:50 2015
@@ -53,6 +53,7 @@ public:
typedef Elf_Vernaux_Impl<ELFT> Elf_Vernaux;
typedef Elf_Versym_Impl<ELFT> Elf_Versym;
typedef Elf_Hash_Impl<ELFT> Elf_Hash;
+ typedef Elf_GnuHash_Impl<ELFT> Elf_GnuHash;
typedef iterator_range<const Elf_Dyn *> Elf_Dyn_Range;
typedef iterator_range<const Elf_Shdr *> Elf_Shdr_Range;
typedef iterator_range<const Elf_Sym *> Elf_Sym_Range;
Modified: llvm/trunk/include/llvm/Object/ELFTypes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELFTypes.h?rev=250291&r1=250290&r2=250291&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/ELFTypes.h (original)
+++ llvm/trunk/include/llvm/Object/ELFTypes.h Wed Oct 14 07:11:50 2015
@@ -484,6 +484,30 @@ struct Elf_Hash_Impl {
}
};
+// .gnu.hash section
+template <class ELFT>
+struct Elf_GnuHash_Impl {
+ LLVM_ELF_IMPORT_TYPES_ELFT(ELFT)
+ Elf_Word nbuckets;
+ Elf_Word symndx;
+ Elf_Word maskwords;
+ Elf_Word shift2;
+
+ ArrayRef<Elf_Off> filter() const {
+ return ArrayRef<Elf_Off>(reinterpret_cast<const Elf_Off *>(&shift2 + 1),
+ maskwords);
+ }
+
+ ArrayRef<Elf_Word> buckets() const {
+ return ArrayRef<Elf_Word>(
+ reinterpret_cast<const Elf_Word *>(filter().end()), nbuckets);
+ }
+
+ ArrayRef<Elf_Word> values(unsigned DynamicSymCount) const {
+ return ArrayRef<Elf_Word>(buckets().end(), DynamicSymCount - symndx);
+ }
+};
+
// MIPS .reginfo section
template <class ELFT>
struct Elf_Mips_RegInfo;
Added: llvm/trunk/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-i386
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-i386?rev=250291&view=auto
==============================================================================
(empty)
Added: llvm/trunk/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-ppc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-ppc?rev=250291&view=auto
==============================================================================
(empty)
Added: llvm/trunk/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-ppc64
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-ppc64?rev=250291&view=auto
==============================================================================
(empty)
Added: llvm/trunk/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-x86_64
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-x86_64?rev=250291&view=auto
==============================================================================
(empty)
Added: llvm/trunk/test/tools/llvm-readobj/elf-gnuhash.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/elf-gnuhash.test?rev=250291&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/elf-gnuhash.test (added)
+++ llvm/trunk/test/tools/llvm-readobj/elf-gnuhash.test Wed Oct 14 07:11:50 2015
@@ -0,0 +1,63 @@
+// Check dumping of the GNU Hash section
+// The input was generated using the following:
+// $ llvm-mc -filetype=obj -triple=i386-pc-linux -o example-i386.o example.s
+// $ llvm-mc -filetype=obj -triple=x86_64-pc-linux -o example-x86_64.o example.s
+// $ llvm-mc -filetype=obj -triple=powerpc-pc-linux -o example-ppc.o example.s
+// $ llvm-mc -filetype=obj -triple=powerpc64-pc-linux -o example-ppc64.o example.s
+// $ ld -shared -m elf_i386 -hash-style=gnu -o gnuhash.so.elf-i386 example-i386.o
+// $ ld -shared -m elf_x86_64 -hash-style=gnu -o gnuhash.so.elf-x86_64 example-x86_64.o
+// $ ld -shared -m elf32ppc -hash-style=gnu -o gnuhash.so.elf-ppc example-ppc.o
+// $ ld -shared -m elf64ppc -hash-style=gnu -o gnuhash.so.elf-ppc64 example-ppc64.o
+// $ cat example.s
+// .globl foo
+// foo:
+
+RUN: llvm-readobj -gnu-hash-table %p/Inputs/gnuhash.so.elf-i386 | FileCheck %s -check-prefix I386
+RUN: llvm-readobj -gnu-hash-table %p/Inputs/gnuhash.so.elf-x86_64 | FileCheck %s -check-prefix X86_64
+RUN: llvm-readobj -gnu-hash-table %p/Inputs/gnuhash.so.elf-ppc | FileCheck %s -check-prefix PPC
+RUN: llvm-readobj -gnu-hash-table %p/Inputs/gnuhash.so.elf-ppc64 | FileCheck %s -check-prefix PPC64
+
+I386: Arch: i386
+I386: GnuHashTable {
+I386-NEXT: Num Buckets: 3
+I386-NEXT: First Hashed Symbol Index: 1
+I386-NEXT: Num Mask Words: 1
+I386-NEXT: Shift Count: 5
+I386-NEXT: Bloom Filter: [0x39004608]
+I386-NEXT: Buckets: [1, 4, 0]
+I386-NEXT: Values: [0xB887388, 0xECD54542, 0x7C92E3BB, 0x1C5871D9]
+I386-NEXT: }
+
+X86_64: Arch: x86_64
+X86_64: GnuHashTable {
+X86_64-NEXT: Num Buckets: 3
+X86_64-NEXT: First Hashed Symbol Index: 1
+X86_64-NEXT: Num Mask Words: 1
+X86_64-NEXT: Shift Count: 6
+X86_64-NEXT: Bloom Filter: [0x800000001204288]
+X86_64-NEXT: Buckets: [1, 4, 0]
+X86_64-NEXT: Values: [0xB887388, 0xECD54542, 0x7C92E3BB, 0x1C5871D9]
+X86_64-NEXT: }
+
+PPC: Arch: powerpc
+PPC: GnuHashTable {
+PPC-NEXT: Num Buckets: 3
+PPC-NEXT: First Hashed Symbol Index: 1
+PPC-NEXT: Num Mask Words: 1
+PPC-NEXT: Shift Count: 5
+PPC-NEXT: Bloom Filter: [0x3D00460A]
+PPC-NEXT: Buckets: [1, 5, 0]
+PPC-NEXT: Values: [0xEEBEC3A, 0xB887388, 0xECD54542, 0x7C92E3BB, 0x1C5871D9]
+PPC-NEXT: }
+
+PPC64: Arch: powerpc64
+PPC64: GnuHashTable {
+PPC64-NEXT: Num Buckets: 3
+PPC64-NEXT: First Hashed Symbol Index: 1
+PPC64-NEXT: Num Mask Words: 1
+PPC64-NEXT: Shift Count: 6
+PPC64-NEXT: Bloom Filter: [0x800000001204288]
+PPC64-NEXT: Buckets: [1, 4, 0]
+PPC64-NEXT: Values: [0xB887388, 0xECD54542, 0x7C92E3BB, 0x1C5871D9]
+PPC64-NEXT: }
+
Modified: llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/ELFDumper.cpp?rev=250291&r1=250290&r2=250291&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/ELFDumper.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/ELFDumper.cpp Wed Oct 14 07:11:50 2015
@@ -56,6 +56,7 @@ public:
void printNeededLibraries() override;
void printProgramHeaders() override;
void printHashTable() override;
+ void printGnuHashTable() override;
void printLoadName() override;
void printAttributes() override;
@@ -76,6 +77,7 @@ private:
typedef typename ELFO::Elf_Rela_Range Elf_Rela_Range;
typedef typename ELFO::Elf_Phdr Elf_Phdr;
typedef typename ELFO::Elf_Hash Elf_Hash;
+ typedef typename ELFO::Elf_GnuHash Elf_GnuHash;
typedef typename ELFO::Elf_Ehdr Elf_Ehdr;
typedef typename ELFO::Elf_Word Elf_Word;
typedef typename ELFO::uintX_t uintX_t;
@@ -136,6 +138,7 @@ private:
const Elf_Sym *DynSymStart = nullptr;
StringRef SOName;
const Elf_Hash *HashTable = nullptr;
+ const Elf_GnuHash *GnuHashTable = nullptr;
const Elf_Shdr *DotDynSymSec = nullptr;
const Elf_Shdr *DotSymtabSec = nullptr;
ArrayRef<Elf_Word> ShndxTable;
@@ -850,6 +853,10 @@ ELFDumper<ELFT>::ELFDumper(const ELFFile
HashTable =
reinterpret_cast<const Elf_Hash *>(toMappedAddr(Dyn.getPtr()));
break;
+ case ELF::DT_GNU_HASH:
+ GnuHashTable =
+ reinterpret_cast<const Elf_GnuHash *>(toMappedAddr(Dyn.getPtr()));
+ break;
case ELF::DT_RELA:
DynRelaRegion.Addr = toMappedAddr(Dyn.getPtr());
break;
@@ -1533,6 +1540,23 @@ void ELFDumper<ELFT>::printHashTable() {
W.printList("Chains", HashTable->chains());
}
+template <typename ELFT>
+void ELFDumper<ELFT>::printGnuHashTable() {
+ DictScope D(W, "GnuHashTable");
+ if (!GnuHashTable)
+ return;
+ W.printNumber("Num Buckets", GnuHashTable->nbuckets);
+ W.printNumber("First Hashed Symbol Index", GnuHashTable->symndx);
+ W.printNumber("Num Mask Words", GnuHashTable->maskwords);
+ W.printNumber("Shift Count", GnuHashTable->shift2);
+ W.printHexList("Bloom Filter", GnuHashTable->filter());
+ W.printList("Buckets", GnuHashTable->buckets());
+ if (!DotDynSymSec)
+ reportError("No dynamic symbol section");
+ W.printHexList("Values",
+ GnuHashTable->values(DotDynSymSec->getEntityCount()));
+}
+
template <typename ELFT> void ELFDumper<ELFT>::printLoadName() {
outs() << "LoadName: " << SOName << '\n';
}
Modified: llvm/trunk/tools/llvm-readobj/ObjDumper.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/ObjDumper.h?rev=250291&r1=250290&r2=250291&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/ObjDumper.h (original)
+++ llvm/trunk/tools/llvm-readobj/ObjDumper.h Wed Oct 14 07:11:50 2015
@@ -39,6 +39,7 @@ public:
virtual void printNeededLibraries() { }
virtual void printProgramHeaders() { }
virtual void printHashTable() { }
+ virtual void printGnuHashTable() { }
virtual void printLoadName() {}
// Only implemented for ARM ELF at this time.
Modified: llvm/trunk/tools/llvm-readobj/StreamWriter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/StreamWriter.h?rev=250291&r1=250290&r2=250291&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/StreamWriter.h (original)
+++ llvm/trunk/tools/llvm-readobj/StreamWriter.h Wed Oct 14 07:11:50 2015
@@ -194,6 +194,19 @@ public:
OS << "]\n";
}
+ template <typename T>
+ void printHexList(StringRef Label, const T &List) {
+ startLine() << Label << ": [";
+ bool Comma = false;
+ for (const auto &Item : List) {
+ if (Comma)
+ OS << ", ";
+ OS << hex(Item);
+ Comma = true;
+ }
+ OS << "]\n";
+ }
+
template<typename T>
void printHex(StringRef Label, T Value) {
startLine() << Label << ": " << hex(Value) << "\n";
Modified: llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp?rev=250291&r1=250290&r2=250291&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp Wed Oct 14 07:11:50 2015
@@ -132,6 +132,10 @@ namespace opts {
cl::opt<bool> HashTable("hash-table",
cl::desc("Display ELF hash table"));
+ // -gnu-hash-table
+ cl::opt<bool> GnuHashTable("gnu-hash-table",
+ cl::desc("Display ELF .gnu.hash section"));
+
// -expand-relocs
cl::opt<bool> ExpandRelocs("expand-relocs",
cl::desc("Expand each shown relocation to multiple lines"));
@@ -322,6 +326,8 @@ static void dumpObject(const ObjectFile
Dumper->printProgramHeaders();
if (opts::HashTable)
Dumper->printHashTable();
+ if (opts::GnuHashTable)
+ Dumper->printGnuHashTable();
if (Obj->getArch() == llvm::Triple::arm && Obj->isELF())
if (opts::ARMAttributes)
Dumper->printAttributes();
More information about the llvm-commits
mailing list