RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-02-04 09:37:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[COFF] Return symbol VAs instead of RVAs for PE files

Browse Source 
This makes llvm-nm consistent with binutils nm on executables and DLLs.
For a vanilla hello world executable, the address of main should include
the default image base of 0x400000.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@243755 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Kleckner 2015-07-31 16:14:22 +00:00
parent 0dd663b598
commit c136e5507a
4 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Object/COFFObjectFile.cpp
View File

@ -171,6 +171,14 @@ ErrorOr<uint64_t> COFFObjectFile::getSymbolAddress(DataRefImpl Ref) const {
if (std::error_code EC = getSection(SectionNumber, Section))
return EC;
Result += Section->VirtualAddress;
// The section VirtualAddress does not include ImageBase, and we want to
// return virtual addresses.
if (PE32Header)
Result += PE32Header->ImageBase;
else if (PE32PlusHeader)
Result += PE32Header->ImageBase;
return Result;
}

BIN
test/Object/Inputs/main-ret-zero-pe-i386.dll Executable file
View File

Binary file not shown.

BIN
test/Object/Inputs/main-ret-zero-pe-i386.exe Executable file
View File

Binary file not shown.

31
test/Object/nm-pe-image.test Normal file
View File

@ -0,0 +1,31 @@
The executable was generated like so:
$ cat t.c
int main() { return 0; }
$ clang --target=i686-windows -c t.c -o t.o
$ lld-link2 t.o -out:t.exe -entry:main -debug
It has a mingw-style symbol table in the executable, which MSVC-produced images
don't have.
RUN: llvm-nm %p/Inputs/main-ret-zero-pe-i386.exe \
RUN: | FileCheck %s -check-prefix PE-EXE
PE-EXE: 00401000 t .bss
PE-EXE: 00401000 t .data
PE-EXE: 00401000 t .text
PE-EXE: 00401000 T _main
The DLL was generated like so:
$ cat t.c
int DllMain(void *mod, long reason, void *reserved) { return 1; }
$ clang --target=i686-windows -c t.c -o t.o
$ lld-link2 t.o -out:t.exe -entry:DllMain -debug -dll
RUN: llvm-nm %p/Inputs/main-ret-zero-pe-i386.dll \
RUN: | FileCheck %s -check-prefix PE-DLL
PE-DLL: 10001000 t .bss
PE-DLL: 10001000 t .data
PE-DLL: 10001000 t .text
PE-DLL: 10001000 T _DllMain