6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-25 16:24:23 +00:00
Code Issues Projects Releases Wiki Activity

Change the name of the field BindTable to bindtable to not over lap the type.

Browse Source 
Should fix the build bot issues from commit r220500.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220504 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Kevin Enderby
2014-10-23 19:53:12 +00:00
parent 1ea06a0ead
commit 4d529076b6
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/llvm-objdump/MachODump.cpp
View File

@ -249,7 +249,7 @@ struct DisassembleInfo {
const char *class_name; const char *class_name;
const char *selector_name; const char *selector_name;
char *method; char *method;
BindTable *BindTable; BindTable *bindtable;
}; };
// SymbolizerGetOpInfo() is the operand information call back function. // SymbolizerGetOpInfo() is the operand information call back function.
@ -1392,7 +1392,7 @@ static void DisassembleInputMachO2(StringRef Filename,
SymbolizerInfo.class_name = nullptr; SymbolizerInfo.class_name = nullptr;
SymbolizerInfo.selector_name = nullptr; SymbolizerInfo.selector_name = nullptr;
SymbolizerInfo.method = nullptr; SymbolizerInfo.method = nullptr;
SymbolizerInfo.BindTable = nullptr; SymbolizerInfo.bindtable = nullptr;
// Disassemble symbol by symbol. // Disassemble symbol by symbol.
for (unsigned SymIdx = 0; SymIdx != Symbols.size(); SymIdx++) { for (unsigned SymIdx = 0; SymIdx != Symbols.size(); SymIdx++) {
@ -1569,8 +1569,8 @@ static void DisassembleInputMachO2(StringRef Filename,
} }
if (SymbolizerInfo.method != nullptr) if (SymbolizerInfo.method != nullptr)
free(SymbolizerInfo.method); free(SymbolizerInfo.method);
if (SymbolizerInfo.BindTable != nullptr) if (SymbolizerInfo.bindtable != nullptr)
delete SymbolizerInfo.BindTable; delete SymbolizerInfo.bindtable;
} }
} }
@ -3412,8 +3412,8 @@ void llvm::printMachOWeakBindTable(const object::MachOObjectFile *Obj) {
// name is returned. If not nullptr is returned. // name is returned. If not nullptr is returned.
static const char *get_dyld_bind_info_symbolname(uint64_t ReferenceValue, static const char *get_dyld_bind_info_symbolname(uint64_t ReferenceValue,
struct DisassembleInfo *info) { struct DisassembleInfo *info) {
if (info->BindTable == nullptr) { if (info->bindtable == nullptr) {
info->BindTable = new (BindTable); info->bindtable = new (BindTable);
SegInfo sectionTable(info->O); SegInfo sectionTable(info->O);
for (const llvm::object::MachOBindEntry &Entry : info->O->bindTable()) { for (const llvm::object::MachOBindEntry &Entry : info->O->bindTable()) {
uint32_t SegIndex = Entry.segmentIndex(); uint32_t SegIndex = Entry.segmentIndex();
@ -3423,11 +3423,11 @@ static const char *get_dyld_bind_info_symbolname(uint64_t ReferenceValue,
StringRef name = Entry.symbolName(); StringRef name = Entry.symbolName();
if (!name.empty()) if (!name.empty())
SymbolName = name.data(); SymbolName = name.data();
info->BindTable->push_back(std::make_pair(Address, SymbolName)); info->bindtable->push_back(std::make_pair(Address, SymbolName));
} }
} }
for (bind_table_iterator BI = info->BindTable->begin(), for (bind_table_iterator BI = info->bindtable->begin(),
BE = info->BindTable->end(); BE = info->bindtable->end();
BI != BE; ++BI) { BI != BE; ++BI) {
uint64_t Address = BI->first; uint64_t Address = BI->first;
if (ReferenceValue == Address) { if (ReferenceValue == Address) {