maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add a SymbolTableEntryBase. 

Use it when we don't need to know if we have a 32 or 64 bit SymbolTableEntry.

llvm-svn: 179074
This commit is contained in:
Rafael Espindola 2013-04-09 00:22:58 +00:00
parent 6cdbe3f6df
commit 5d6cec9bff
2 changed files with 38 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,13 @@ namespace MachOFormat {
support::ulittle32_t Word1;
};
struct SymbolTableEntryBase {
support::ulittle32_t StringIndex;
uint8_t Type;
uint8_t SectionIndex;
support::ulittle16_t Flags;
};
template<bool is64Bits>
struct SymbolTableEntry;
@ -263,12 +270,11 @@ private:
void moveToNextSection(DataRefImpl &DRI) const;
const MachOFormat::SymbolTableEntry<false> *
getSymbolTableEntry(DataRefImpl DRI,
const MachOFormat::SymtabLoadCommand *SymtabLoadCmd) const;
const MachOFormat::SymbolTableEntryBase *
getSymbolTableEntryBase(DataRefImpl DRI) const;
const MachOFormat::SymbolTableEntry<true> *
getSymbol64TableEntry(DataRefImpl DRI,
const MachOFormat::SymbolTableEntryBase *
getSymbolTableEntryBase(DataRefImpl DRI,
const MachOFormat::SymtabLoadCommand *SymtabLoadCmd) const;
void moveToNextSymbol(DataRefImpl &DRI) const;

74
llvm/lib/Object/MachOObjectFile.cpp
View File

@ -116,47 +116,40 @@ void MachOObjectFile::moveToNextSymbol(DataRefImpl &DRI) const {
}
}
const MachOFormat::SymbolTableEntry<false> *
MachOObjectFile::getSymbolTableEntry(DataRefImpl DRI) const {
const MachOFormat::SymbolTableEntryBase *
MachOObjectFile::getSymbolTableEntryBase(DataRefImpl DRI) const {
const MachOFormat::LoadCommand *Command = getLoadCommandInfo(DRI.d.a);
const MachOFormat::SymtabLoadCommand *SymtabLoadCmd =
reinterpret_cast<const MachOFormat::SymtabLoadCommand*>(Command);
return getSymbolTableEntry(DRI, SymtabLoadCmd);
return getSymbolTableEntryBase(DRI, SymtabLoadCmd);
}
const MachOFormat::SymbolTableEntry<false> *
MachOObjectFile::getSymbolTableEntry(DataRefImpl DRI,
MachOObjectFile::getSymbolTableEntry(DataRefImpl DRI) const {
const MachOFormat::SymbolTableEntryBase *Base = getSymbolTableEntryBase(DRI);
return reinterpret_cast<const MachOFormat::SymbolTableEntry<false>*>(Base);
}
const MachOFormat::SymbolTableEntryBase *
MachOObjectFile::getSymbolTableEntryBase(DataRefImpl DRI,
const MachOFormat::SymtabLoadCommand *SymtabLoadCmd) const {
uint64_t SymbolTableOffset = SymtabLoadCmd->SymbolTableOffset;
unsigned Index = DRI.d.b;
uint64_t Offset = (SymbolTableOffset +
Index * sizeof(MachOFormat::SymbolTableEntry<false>));
StringRef Data =
getData(Offset, sizeof(MachOFormat::SymbolTableEntry<false>));
unsigned SymbolTableEntrySize = is64Bit() ?
sizeof(MachOFormat::SymbolTableEntry<true>) :
sizeof(MachOFormat::SymbolTableEntry<false>);
uint64_t Offset = SymbolTableOffset + Index * SymbolTableEntrySize;
StringRef Data = getData(Offset, SymbolTableEntrySize);
return
reinterpret_cast<const MachOFormat::SymbolTableEntry<false>*>(Data.data());
reinterpret_cast<const MachOFormat::SymbolTableEntryBase*>(Data.data());
}
const MachOFormat::SymbolTableEntry<true>*
MachOObjectFile::getSymbol64TableEntry(DataRefImpl DRI) const {
const MachOFormat::LoadCommand *Command = getLoadCommandInfo(DRI.d.a);
const MachOFormat::SymtabLoadCommand *SymtabLoadCmd =
reinterpret_cast<const MachOFormat::SymtabLoadCommand*>(Command);
return getSymbol64TableEntry(DRI, SymtabLoadCmd);
}
const MachOFormat::SymbolTableEntry<true>*
MachOObjectFile::getSymbol64TableEntry(DataRefImpl DRI,
const MachOFormat::SymtabLoadCommand *SymtabLoadCmd) const {
uint64_t SymbolTableOffset = SymtabLoadCmd->SymbolTableOffset;
unsigned Index = DRI.d.b;
uint64_t Offset = (SymbolTableOffset +
Index * sizeof(MachOFormat::SymbolTableEntry<true>));
StringRef Data = getData(Offset, sizeof(MachOFormat::SymbolTableEntry<true>));
return
reinterpret_cast<const MachOFormat::SymbolTableEntry<true>*>(Data.data());
const MachOFormat::SymbolTableEntryBase *Base = getSymbolTableEntryBase(DRI);
return reinterpret_cast<const MachOFormat::SymbolTableEntry<true>*>(Base);
}
error_code MachOObjectFile::getSymbolNext(DataRefImpl DRI,
@ -176,16 +169,9 @@ error_code MachOObjectFile::getSymbolName(DataRefImpl DRI,
StringRef StringTable = getData(SymtabLoadCmd->StringTableOffset,
SymtabLoadCmd->StringTableSize);
uint32_t StringIndex;
if (is64Bit()) {
const MachOFormat::SymbolTableEntry<true> *Entry =
getSymbol64TableEntry(DRI, SymtabLoadCmd);
StringIndex = Entry->StringIndex;
} else {
const MachOFormat::SymbolTableEntry<false> *Entry =
getSymbolTableEntry(DRI, SymtabLoadCmd);
StringIndex = Entry->StringIndex;
}
const MachOFormat::SymbolTableEntryBase *Entry =
getSymbolTableEntryBase(DRI, SymtabLoadCmd);
uint32_t StringIndex = Entry->StringIndex;
const char *Start = &StringTable.data()[StringIndex];
Result = StringRef(Start);
@ -403,16 +389,10 @@ error_code MachOObjectFile::getSymbolSection(DataRefImpl Symb,
error_code MachOObjectFile::getSymbolType(DataRefImpl Symb,
SymbolRef::Type &Res) const {
uint8_t n_type;
if (is64Bit()) {
const MachOFormat::SymbolTableEntry<true> *Entry =
getSymbol64TableEntry(Symb);
n_type = Entry->Type;
} else {
const MachOFormat::SymbolTableEntry<false> *Entry =
getSymbolTableEntry(Symb);
n_type = Entry->Type;
}
const MachOFormat::SymbolTableEntryBase *Entry =
getSymbolTableEntryBase(Symb);
uint8_t n_type = Entry->Type;
Res = SymbolRef::ST_Other;
// If this is a STAB debugging symbol, we can do nothing more.