mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-15 05:24:01 +00:00
Revert r145180 as it is causing test failures on all the bots.
Original commit message: Fixed ObjectFile functions: - 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@145182 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -101,7 +101,7 @@ error_code COFFObjectFile::getSymbolNext(DataRefImpl Symb,
|
||||
return getSymbolName(symb, Result);
|
||||
}
|
||||
|
||||
error_code COFFObjectFile::getSymbolFileOffset(DataRefImpl Symb,
|
||||
error_code COFFObjectFile::getSymbolOffset(DataRefImpl Symb,
|
||||
uint64_t &Result) const {
|
||||
const coff_symbol *symb = toSymb(Symb);
|
||||
const coff_section *Section = NULL;
|
||||
@ -113,7 +113,7 @@ error_code COFFObjectFile::getSymbolFileOffset(DataRefImpl Symb,
|
||||
if (Type == 'U' || Type == 'w')
|
||||
Result = UnknownAddressOrSize;
|
||||
else if (Section)
|
||||
Result = Section->PointerToRawData + symb->Value;
|
||||
Result = Section->VirtualAddress + symb->Value;
|
||||
else
|
||||
Result = symb->Value;
|
||||
return object_error::success;
|
||||
@ -131,9 +131,11 @@ error_code COFFObjectFile::getSymbolAddress(DataRefImpl Symb,
|
||||
if (Type == 'U' || Type == 'w')
|
||||
Result = UnknownAddressOrSize;
|
||||
else if (Section)
|
||||
Result = Section->VirtualAddress + symb->Value;
|
||||
Result = reinterpret_cast<uintptr_t>(base() +
|
||||
Section->PointerToRawData +
|
||||
symb->Value);
|
||||
else
|
||||
Result = symb->Value;
|
||||
Result = reinterpret_cast<uintptr_t>(base() + symb->Value);
|
||||
return object_error::success;
|
||||
}
|
||||
|
||||
@ -622,11 +624,6 @@ error_code COFFObjectFile::getRelocationAddress(DataRefImpl Rel,
|
||||
Res = toRel(Rel)->VirtualAddress;
|
||||
return object_error::success;
|
||||
}
|
||||
error_code COFFObjectFile::getRelocationOffset(DataRefImpl Rel,
|
||||
uint64_t &Res) const {
|
||||
Res = toRel(Rel)->VirtualAddress;
|
||||
return object_error::success;
|
||||
}
|
||||
error_code COFFObjectFile::getRelocationSymbol(DataRefImpl Rel,
|
||||
SymbolRef &Res) const {
|
||||
const coff_relocation* R = toRel(Rel);
|
||||
|
Reference in New Issue
Block a user