From da2a2372c6ae715befae7f086afe769dd80814f3 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Sat, 13 Apr 2013 01:45:40 +0000 Subject: Finish templating MachObjectFile over endianness. We are now able to handle big endian macho files in llvm-readobject. Thanks to David Fang for providing the object files. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179440 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-objdump/MachODump.cpp | 48 ++++++++++++++++++++++++++----------- tools/llvm-objdump/llvm-objdump.cpp | 18 ++++++++++---- 2 files changed, 48 insertions(+), 18 deletions(-) (limited to 'tools/llvm-objdump') diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp index 89847d0499..4b6cb5f54c 100644 --- a/tools/llvm-objdump/MachODump.cpp +++ b/tools/llvm-objdump/MachODump.cpp @@ -27,6 +27,7 @@ #include "llvm/MC/MCRegisterInfo.h" #include "llvm/MC/MCSubtargetInfo.h" #include "llvm/Object/MachO.h" +#include "llvm/Support/Casting.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" #include "llvm/Support/Format.h" @@ -183,11 +184,14 @@ static void emitDOTFile(const char *FileName, const MCFunction &f, Out << "}\n"; } -static void getSectionsAndSymbols(const MachOObjectFileBase::Header *Header, - MachOObjectFileBase *MachOObj, - std::vector &Sections, - std::vector &Symbols, - SmallVectorImpl &FoundFns) { +template +static void +getSectionsAndSymbols(const typename MachOObjectFileMiddle::Header *Header, + const MachOObjectFileMiddle *MachOObj, + std::vector &Sections, + std::vector &Symbols, + SmallVectorImpl &FoundFns) { + typedef MachOObjectFileMiddle ObjType; error_code ec; for (symbol_iterator SI = MachOObj->begin_symbols(), SE = MachOObj->end_symbols(); SI != SE; SI.increment(ec)) @@ -202,19 +206,23 @@ static void getSectionsAndSymbols(const MachOObjectFileBase::Header *Header, } for (unsigned i = 0; i != Header->NumLoadCommands; ++i) { - const MachOObjectFileBase::LoadCommand *Command = + const typename ObjType::LoadCommand *Command = MachOObj->getLoadCommandInfo(i); if (Command->Type == macho::LCT_FunctionStarts) { // We found a function starts segment, parse the addresses for later // consumption. - const MachOObjectFileBase::LinkeditDataLoadCommand *LLC = - reinterpret_cast(Command); + const typename ObjType::LinkeditDataLoadCommand *LLC = + reinterpret_cast(Command); MachOObj->ReadULEB128s(LLC->DataOffset, FoundFns); } } } +template +static void DisassembleInputMachO2(StringRef Filename, + MachOObjectFileMiddle *MachOOF); + void llvm::DisassembleInputMachO(StringRef Filename) { OwningPtr Buff; @@ -226,7 +234,18 @@ void llvm::DisassembleInputMachO(StringRef Filename) { OwningPtr MachOOF(static_cast( ObjectFile::createMachOObjectFile(Buff.take()))); - const Target *TheTarget = GetTarget(MachOOF.get()); + if (MachOObjectFileLE *O = dyn_cast(MachOOF.get())) { + DisassembleInputMachO2(Filename, O); + return; + } + MachOObjectFileBE *O = cast(MachOOF.get()); + DisassembleInputMachO2(Filename, O); +} + +template +static void DisassembleInputMachO2(StringRef Filename, + MachOObjectFileMiddle *MachOOF) { + const Target *TheTarget = GetTarget(MachOOF); if (!TheTarget) { // GetTarget prints out stuff. return; @@ -254,13 +273,14 @@ void llvm::DisassembleInputMachO(StringRef Filename) { outs() << '\n' << Filename << ":\n\n"; - const MachOObjectFileBase::Header *Header = MachOOF->getHeader(); + const typename MachOObjectFileMiddle::Header *Header = + MachOOF->getHeader(); std::vector Sections; std::vector Symbols; SmallVector FoundFns; - getSectionsAndSymbols(Header, MachOOF.get(), Sections, Symbols, FoundFns); + getSectionsAndSymbols(Header, MachOOF, Sections, Symbols, FoundFns); // Make a copy of the unsorted symbol list. FIXME: duplication std::vector UnsortedSymbols(Symbols); @@ -274,7 +294,7 @@ void llvm::DisassembleInputMachO(StringRef Filename) { #endif OwningPtr diContext; - ObjectFile *DbgObj = MachOOF.get(); + ObjectFile *DbgObj = MachOOF; // Try to find debug info and set up the DIContext for it. if (UseDbg) { // A separate DSym file path was specified, parse it as a macho file, @@ -563,7 +583,7 @@ void llvm::DisassembleInputMachO(StringRef Filename) { Relocs[j].second.getName(SymName); outs() << "\t# " << SymName << ' '; - DumpAddress(Addr, Sections, MachOOF.get(), outs()); + DumpAddress(Addr, Sections, MachOOF, outs()); } // If this instructions contains an address, see if we can evaluate @@ -572,7 +592,7 @@ void llvm::DisassembleInputMachO(StringRef Filename) { Inst.Address, Inst.Size); if (targ != -1ULL) - DumpAddress(targ, Sections, MachOOF.get(), outs()); + DumpAddress(targ, Sections, MachOOF, outs()); // Print debug info. if (diContext) { diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index 4790d7a5fe..5a0519ddc1 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/tools/llvm-objdump/llvm-objdump.cpp @@ -191,6 +191,14 @@ bool llvm::RelocAddressLess(RelocationRef a, RelocationRef b) { return a_addr < b_addr; } +StringRef +getSectionFinalSegmentName(const MachOObjectFileBase *MachO, DataRefImpl DR) { + if (const MachOObjectFileLE *O = dyn_cast(MachO)) + return O->getSectionFinalSegmentName(DR); + const MachOObjectFileBE *O = dyn_cast(MachO); + return O->getSectionFinalSegmentName(DR); +} + static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) { const Target *TheTarget = getTarget(Obj); // getTarget() will have already issued a diagnostic if necessary, so @@ -255,9 +263,10 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) { std::sort(Rels.begin(), Rels.end(), RelocAddressLess); StringRef SegmentName = ""; - if (const MachOObjectFileBase *MachO = dyn_cast(Obj)) { + if (const MachOObjectFileBase *MachO = + dyn_cast(Obj)) { DataRefImpl DR = i->getRawDataRefImpl(); - SegmentName = MachO->getSectionFinalSegmentName(DR); + SegmentName = getSectionFinalSegmentName(MachO, DR); } StringRef name; if (error(i->getName(name))) break; @@ -591,9 +600,10 @@ static void PrintSymbolTable(const ObjectFile *o) { else if (Section == o->end_sections()) outs() << "*UND*"; else { - if (const MachOObjectFileBase *MachO = dyn_cast(o)) { + if (const MachOObjectFileBase *MachO = + dyn_cast(o)) { DataRefImpl DR = Section->getRawDataRefImpl(); - StringRef SegmentName = MachO->getSectionFinalSegmentName(DR); + StringRef SegmentName = getSectionFinalSegmentName(MachO, DR); outs() << SegmentName << ","; } StringRef SectionName; -- cgit v1.2.3