RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 12:50:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Object][ELF] Fix incorrect size of members for the 64 version of Elf_Phdr_Impl.

Browse Source 
llvm-svn: 171650
This commit is contained in:
Michael J. Spencer 2013-01-06 03:57:11 +00:00
parent b8ff7ef369
commit 44db267406
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/llvm/Object/ELF.h
View File

@ -464,9 +464,9 @@ struct Elf_Phdr_Impl<target_endianness, max_alignment, true> {
Elf_Off p_offset; // FileOffset where segment is located, in bytes
Elf_Addr p_vaddr; // Virtual Address of beginning of segment
Elf_Addr p_paddr; // Physical address of beginning of segment (OS-specific)
Elf_Word p_filesz; // Num. of bytes in file image of segment (may be zero)
Elf_Word p_memsz; // Num. of bytes in mem image of segment (may be zero)
Elf_Word p_align; // Segment alignment constraint
Elf_Xword p_filesz; // Num. of bytes in file image of segment (may be zero)
Elf_Xword p_memsz; // Num. of bytes in mem image of segment (may be zero)
Elf_Xword p_align; // Segment alignment constraint
};
template<endianness target_endianness, std::size_t max_alignment, bool is64Bits>

BIN
test/Object/Inputs/program-headers.elf-x86-64 Normal file
View File

Binary file not shown.

10
test/Object/objdump-private-headers.test
View File

@ -1,8 +1,18 @@
RUN: llvm-objdump -p %p/Inputs/program-headers.elf-i386 \
RUN: | FileCheck %s -check-prefix ELF-i386
RUN: llvm-objdump -p %p/Inputs/program-headers.elf-x86-64 \
RUN: | FileCheck %s -check-prefix ELF-x86-64
ELF-i386: Program Header:
ELF-i386: LOAD off 0x00000000 vaddr 0x08048000 paddr 0x08048000 align 2**12
ELF-i386: filesz 0x00000134 memsz 0x00000134 flags r-x
ELF-i386: STACK off 0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**2
ELF-i386: filesz 0x00000000 memsz 0x00000000 flags rw-
ELF-x86-64: Program Header:
ELF-x86-64: LOAD off 0x0000000000000000 vaddr 0x0000000000400000 paddr 0x0000000000400000 align 2**21
ELF-x86-64: filesz 0x0000000000000138 memsz 0x0000000000000138 flags r-x
ELF-x86-64: EH_FRAME off 0x00000000000000f4 vaddr 0x00000000004000f4 paddr 0x00000000004000f4 align 2**2
ELF-x86-64: filesz 0x0000000000000014 memsz 0x0000000000000014 flags r--
ELF-x86-64: STACK off 0x0000000000000000 vaddr 0x0000000000000000 paddr 0x0000000000000000 align 2**3
ELF-x86-64: filesz 0x0000000000000000 memsz 0x0000000000000000 flags rw-