RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-20 10:38:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove usage of InMemoryStruct in getSymbol.

Browse Source 
llvm-svn: 178984
This commit is contained in:
Rafael Espindola 2013-04-07 15:35:18 +00:00
parent df94a6f10e
commit 4af23ca748
2 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/llvm/Object/MachO.h
View File

@ -156,6 +156,10 @@ public:
getLinkeditDataLoadCommand(LoadCommandInfo LCI) const;
const MachOFormat::Section64 *getSection64(DataRefImpl DRI) const;
const MachOFormat::Section *getSection(DataRefImpl DRI) const;
const MachOFormat::Symbol64TableEntry *
getSymbol64TableEntry(DataRefImpl DRI) const;
const MachOFormat::SymbolTableEntry *
getSymbolTableEntry(DataRefImpl DRI) const;
const MachOObject *getObject() const { return MachOObj.get(); }
@ -224,16 +228,10 @@ private:
void moveToNextSection(DataRefImpl &DRI) const;
const MachOFormat::SymbolTableEntry *
getSymbolTableEntry(DataRefImpl DRI) const;
const MachOFormat::SymbolTableEntry *
getSymbolTableEntry(DataRefImpl DRI,
const MachOFormat::SymtabLoadCommand *SymtabLoadCmd) const;
const MachOFormat::Symbol64TableEntry *
getSymbol64TableEntry(DataRefImpl DRI) const;
const MachOFormat::Symbol64TableEntry *
getSymbol64TableEntry(DataRefImpl DRI,
const MachOFormat::SymtabLoadCommand *SymtabLoadCmd) const;

32
tools/llvm-readobj/MachODumper.cpp
View File

@ -197,38 +197,20 @@ static void getSection(const MachOObjectFile *Obj,
}
}
static void getSymbolTableEntry(const MachOObject *MachO,
DataRefImpl DRI,
InMemoryStruct<macho::SymbolTableEntry> &Res) {
InMemoryStruct<macho::SymtabLoadCommand> SymtabLoadCmd;
LoadCommandInfo LCI = MachO->getLoadCommandInfo(DRI.d.a);
MachO->ReadSymtabLoadCommand(LCI, SymtabLoadCmd);
MachO->ReadSymbolTableEntry(SymtabLoadCmd->SymbolTableOffset, DRI.d.b, Res);
}
static void getSymbol64TableEntry(const MachOObject *MachO,
DataRefImpl DRI,
InMemoryStruct<macho::Symbol64TableEntry> &Res) {
InMemoryStruct<macho::SymtabLoadCommand> SymtabLoadCmd;
LoadCommandInfo LCI = MachO->getLoadCommandInfo(DRI.d.a);
MachO->ReadSymtabLoadCommand(LCI, SymtabLoadCmd);
MachO->ReadSymbol64TableEntry(SymtabLoadCmd->SymbolTableOffset, DRI.d.b, Res);
}
static void getSymbol(const MachOObject *MachOObj,
static void getSymbol(const MachOObjectFile *Obj,
DataRefImpl DRI,
MachOSymbol &Symbol) {
const MachOObject *MachOObj = Obj->getObject();
if (MachOObj->is64Bit()) {
InMemoryStruct<macho::Symbol64TableEntry> Entry;
getSymbol64TableEntry(MachOObj, DRI, Entry);
const MachOFormat::Symbol64TableEntry *Entry =
Obj->getSymbol64TableEntry( DRI);
Symbol.StringIndex = Entry->StringIndex;
Symbol.Type = Entry->Type;
Symbol.SectionIndex = Entry->SectionIndex;
Symbol.Flags = Entry->Flags;
Symbol.Value = Entry->Value;
} else {
InMemoryStruct<macho::SymbolTableEntry> Entry;
getSymbolTableEntry(MachOObj, DRI, Entry);
const MachOFormat::SymbolTableEntry *Entry = Obj->getSymbolTableEntry(DRI);
Symbol.StringIndex = Entry->StringIndex;
Symbol.Type = Entry->Type;
Symbol.SectionIndex = Entry->SectionIndex;
@ -397,10 +379,8 @@ void MachODumper::printSymbol(symbol_iterator SymI) {
if (SymI->getName(SymbolName))
SymbolName = "";
const MachOObject *MachO = const_cast<MachOObjectFile*>(Obj)->getObject();
MachOSymbol Symbol;
getSymbol(MachO, SymI->getRawDataRefImpl(), Symbol);
getSymbol(Obj, SymI->getRawDataRefImpl(), Symbol);
StringRef SectionName;
section_iterator SecI(Obj->end_sections());