6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-12 13:30:51 +00:00
Code Issues Projects Releases Wiki Activity

[COFF] Consider the ImageBase when reporting section addresses

Browse Source 
This lets us reenable the lld test disabled in r243758.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@243761 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Majnemer 2015-07-31 17:40:24 +00:00
parent 26e09e2da5
commit 0229c3b7ad
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Object/COFFObjectFile.cpp
View File

@ -177,7 +177,7 @@ ErrorOr<uint64_t> COFFObjectFile::getSymbolAddress(DataRefImpl Ref) const {
if (PE32Header) if (PE32Header)
Result += PE32Header->ImageBase; Result += PE32Header->ImageBase;
else if (PE32PlusHeader) else if (PE32PlusHeader)
Result += PE32Header->ImageBase; Result += PE32PlusHeader->ImageBase;
return Result; return Result;
} }
@ -274,7 +274,15 @@ std::error_code COFFObjectFile::getSectionName(DataRefImpl Ref,
uint64_t COFFObjectFile::getSectionAddress(DataRefImpl Ref) const { uint64_t COFFObjectFile::getSectionAddress(DataRefImpl Ref) const {
const coff_section *Sec = toSec(Ref); const coff_section *Sec = toSec(Ref);
return Sec->VirtualAddress; uint64_t Result = Sec->VirtualAddress;
// The section VirtualAddress does not include ImageBase, and we want to
// return virtual addresses.
if (PE32Header)
Result += PE32Header->ImageBase;
else if (PE32PlusHeader)
Result += PE32PlusHeader->ImageBase;
return Result;
} }
uint64_t COFFObjectFile::getSectionSize(DataRefImpl Ref) const { uint64_t COFFObjectFile::getSectionSize(DataRefImpl Ref) const {