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

Fixed ObjectFile functions:

Browse Source 
- getSymbolOffset() renamed as getSymbolFileOffset()
- getSymbolFileOffset(), getSymbolAddress(), getRelocationAddress() returns same result for ELFObjectFile, MachOObjectFile and COFFObjectFile.
- added getRelocationOffset()
- fixed MachOObjectFile::getSymbolSize()
- fixed MachOObjectFile::getSymbolSection()
- fixed MachOObjectFile::getSymbolOffset() for symbols without section data.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@145180 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Danil Malyshev
2011-11-27 10:12:52 +00:00
parent 2eb5a744b1
commit 9b24738bd1
11 changed files with 150 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
lib/Object/MachOObjectFile.cpp
View File

@ -125,23 +125,27 @@ error_code MachOObjectFile::getSymbolName(DataRefImpl DRI,
return object_error::success;
}
error_code MachOObjectFile::getSymbolOffset(DataRefImpl DRI,
uint64_t &Result) const {
uint64_t SectionOffset;
uint8_t SectionIndex;
error_code MachOObjectFile::getSymbolFileOffset(DataRefImpl DRI,
uint64_t &Result) const {
if (MachOObj->is64Bit()) {
InMemoryStruct<macho::Symbol64TableEntry> Entry;
getSymbol64TableEntry(DRI, Entry);
Result = Entry->Value;
SectionIndex = Entry->SectionIndex;
if (Entry->SectionIndex) {
InMemoryStruct<macho::Section64> Section;
getSection64(Sections[Entry->SectionIndex-1], Section);
Result += Section->Offset - Section->Address;
}
} else {
InMemoryStruct<macho::SymbolTableEntry> Entry;
getSymbolTableEntry(DRI, Entry);
Result = Entry->Value;
SectionIndex = Entry->SectionIndex;
if (Entry->SectionIndex) {
InMemoryStruct<macho::Section> Section;
getSection(Sections[Entry->SectionIndex-1], Section);
Result += Section->Offset - Section->Address;
}
}
getSectionAddress(Sections[SectionIndex-1], SectionOffset);
Result -= SectionOffset;
return object_error::success;
}
@ -162,7 +166,50 @@ error_code MachOObjectFile::getSymbolAddress(DataRefImpl DRI,
error_code MachOObjectFile::getSymbolSize(DataRefImpl DRI,
uint64_t &Result) const {
Result = UnknownAddressOrSize;
uint32_t LoadCommandCount = MachOObj->getHeader().NumLoadCommands;
uint64_t BeginOffset;
uint64_t EndOffset = 0;
uint8_t SectionIndex;
if (MachOObj->is64Bit()) {
InMemoryStruct<macho::Symbol64TableEntry> Entry;
getSymbol64TableEntry(DRI, Entry);
BeginOffset = Entry->Value;
SectionIndex = Entry->SectionIndex;
if (!SectionIndex) {
Result = UnknownAddressOrSize;
return object_error::success;
}
DRI.d.b++;
moveToNextSymbol(DRI);
if (DRI.d.a < LoadCommandCount) {
getSymbol64TableEntry(DRI, Entry);
if (Entry->SectionIndex == SectionIndex)
EndOffset += Entry->Value;
}
} else {
InMemoryStruct<macho::SymbolTableEntry> Entry;
getSymbolTableEntry(DRI, Entry);
BeginOffset = Entry->Value;
SectionIndex = Entry->SectionIndex;
if (!SectionIndex) {
Result = UnknownAddressOrSize;
return object_error::success;
}
DRI.d.b++;
moveToNextSymbol(DRI);
if (DRI.d.a < LoadCommandCount) {
getSymbolTableEntry(DRI, Entry);
if (Entry->SectionIndex == SectionIndex)
EndOffset += Entry->Value;
}
}
if (!EndOffset) {
uint64_t Size;
getSectionSize(Sections[SectionIndex-1], Size);
getSectionAddress(Sections[SectionIndex-1], EndOffset);
EndOffset += Size;
}
Result = EndOffset - BeginOffset;
return object_error::success;
}
@ -275,7 +322,7 @@ error_code MachOObjectFile::getSymbolSection(DataRefImpl Symb,
if (index == 0)
Res = end_sections();
else
Res = section_iterator(SectionRef(Sections[index], this));
Res = section_iterator(SectionRef(Sections[index-1], this));
return object_error::success;
}
@ -614,7 +661,7 @@ error_code MachOObjectFile::getRelocationAddress(DataRefImpl Rel,
bool isScattered = (Arch != Triple::x86_64) &&
(RE->Word0 & macho::RF_Scattered);
uint64_t RelAddr = 0;
if (isScattered)
if (isScattered)
RelAddr = RE->Word0 & 0xFFFFFF;
else
RelAddr = RE->Word0;
@ -622,6 +669,20 @@ error_code MachOObjectFile::getRelocationAddress(DataRefImpl Rel,
Res = reinterpret_cast<uintptr_t>(sectAddress + RelAddr);
return object_error::success;
}
error_code MachOObjectFile::getRelocationOffset(DataRefImpl Rel,
uint64_t &Res) const {
InMemoryStruct<macho::RelocationEntry> RE;
getRelocation(Rel, RE);
unsigned Arch = getArch();
bool isScattered = (Arch != Triple::x86_64) &&
(RE->Word0 & macho::RF_Scattered);
if (isScattered)
Res = RE->Word0 & 0xFFFFFF;
else
Res = RE->Word0;
return object_error::success;
}
error_code MachOObjectFile::getRelocationSymbol(DataRefImpl Rel,
SymbolRef &Res) const {
InMemoryStruct<macho::RelocationEntry> RE;