diff options
author | Daniel Dunbar <daniel@zuster.org> | 2010-11-27 13:26:12 +0000 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2010-11-27 13:26:12 +0000 |
commit | 4c55e0db0f0a095dcd76326bef24d0fe05d2a5e4 (patch) | |
tree | ff0f8b98a1f6b8a9d0bd3bd2ace1a7bdc6886919 | |
parent | 4aeb48904344d2dd8e3b8f39a4752567828ad96f (diff) | |
download | llvm-4c55e0db0f0a095dcd76326bef24d0fe05d2a5e4.tar.gz llvm-4c55e0db0f0a095dcd76326bef24d0fe05d2a5e4.tar.bz2 llvm-4c55e0db0f0a095dcd76326bef24d0fe05d2a5e4.tar.xz |
macho-dump: Add support for dumping dysymtab indirect symbol table.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120214 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/llvm/Object/MachOFormat.h | 9 | ||||
-rw-r--r-- | include/llvm/Object/MachOObject.h | 4 | ||||
-rw-r--r-- | lib/Object/MachOObject.cpp | 13 | ||||
-rw-r--r-- | tools/macho-dump/macho-dump.cpp | 20 |
4 files changed, 45 insertions, 1 deletions
diff --git a/include/llvm/Object/MachOFormat.h b/include/llvm/Object/MachOFormat.h index 9e18d2f209..a6f0afbd94 100644 --- a/include/llvm/Object/MachOFormat.h +++ b/include/llvm/Object/MachOFormat.h @@ -220,6 +220,15 @@ namespace macho { /// @} + /// @name Indirect Symbol Table + /// @{ + + struct IndirectSymbolTableEntry { + uint32_t Index; + }; + + /// @} + // See <mach-o/nlist.h>. enum SymbolTypeType { STT_Undefined = 0x00, diff --git a/include/llvm/Object/MachOObject.h b/include/llvm/Object/MachOObject.h index 9006581099..79fbfd21b6 100644 --- a/include/llvm/Object/MachOObject.h +++ b/include/llvm/Object/MachOObject.h @@ -125,6 +125,10 @@ public: void ReadDysymtabLoadCommand( const LoadCommandInfo &LCI, InMemoryStruct<macho::DysymtabLoadCommand> &Res) const; + void ReadIndirectSymbolTableEntry( + const macho::DysymtabLoadCommand &DLC, + unsigned Index, + InMemoryStruct<macho::IndirectSymbolTableEntry> &Res) const; /// @} }; diff --git a/lib/Object/MachOObject.cpp b/lib/Object/MachOObject.cpp index 94f6d7763a..236dfe0ce5 100644 --- a/lib/Object/MachOObject.cpp +++ b/lib/Object/MachOObject.cpp @@ -230,3 +230,16 @@ void MachOObject::ReadDysymtabLoadCommand(const LoadCommandInfo &LCI, InMemoryStruct<macho::DysymtabLoadCommand> &Res) const { ReadInMemoryStruct(*this, Buffer->getBuffer(), LCI.Offset, Res); } + +template<> +void SwapStruct(macho::IndirectSymbolTableEntry &Value) { + SwapValue(Value.Index); +} +void +MachOObject::ReadIndirectSymbolTableEntry(const macho::DysymtabLoadCommand &DLC, + unsigned Index, + InMemoryStruct<macho::IndirectSymbolTableEntry> &Res) const { + uint64_t Offset = (DLC.IndirectSymbolTableOffset + + Index * sizeof(macho::IndirectSymbolTableEntry)); + ReadInMemoryStruct(*this, Buffer->getBuffer(), Offset, Res); +} diff --git a/tools/macho-dump/macho-dump.cpp b/tools/macho-dump/macho-dump.cpp index 9648caec55..487a00607b 100644 --- a/tools/macho-dump/macho-dump.cpp +++ b/tools/macho-dump/macho-dump.cpp @@ -14,6 +14,7 @@ #include "llvm/Object/MachOObject.h" #include "llvm/ADT/Twine.h" #include "llvm/Support/CommandLine.h" +#include "llvm/Support/Format.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" @@ -154,7 +155,24 @@ static int DumpDysymtabCommand(MachOObject &Obj, outs() << " ('locreloff', " << DLC->LocalRelocationTableOffset << ")\n"; outs() << " ('nlocrel', " << DLC->NumLocalRelocationTableEntries << ")\n"; - return 0; + // Dump the indirect symbol table. + int Res = 0; + outs() << " ('_indirect_symbols', [\n"; + for (unsigned i = 0; i != DLC->NumIndirectSymbolTableEntries; ++i) { + InMemoryStruct<macho::IndirectSymbolTableEntry> ISTE; + Obj.ReadIndirectSymbolTableEntry(*DLC, i, ISTE); + if (!ISTE) { + Res = Error("unable to read segment load command"); + break; + } + + outs() << " # Indirect Symbol " << i << "\n"; + outs() << " (('symbol_index', " + << format("%#x", ISTE->Index) << "),),\n"; + } + outs() << " ])\n"; + + return Res; } static int DumpLoadCommand(MachOObject &Obj, unsigned Index) { |