mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-20 03:23:01 +02:00
dd2311d56c
Somehow a few massive errors slipped though the cracks of testing. 1. The code in Segment::finalize was left over from the old layout algorithm. In certain situations this would cause very strange issues with segment layout. For instance in the shift-segments.test case it would cause the second segment to have the same offset as the first. 2. In debugging this I discovered another issue. Namely section alignment was not being computed based on Section->Align but instead Section->Offset which is bizarre and makes no sense. I have no clue how it worked in the first place. This issue is also fixed 3. Fixing #2 exposed a bug where things were not being written past the end of the file that technically should have been. This was because in certain cases (like overlapping-segments) the end of the file wouldn't always be bumped if the offset could be chosen relative to an existing segment that already had it's offset chosen. For fully nested segments this is fine but for overlapping segments this leaves the end of the file short. So I changed how the offset is bumped when looping though segments. Differential Revision: https://reviews.llvm.org/D38436 llvm-svn: 314918
71 lines
1.9 KiB
Plaintext
71 lines
1.9 KiB
Plaintext
# RUN: yaml2obj %s -o %t
|
|
# RUN: llvm-objcopy %t %t2
|
|
# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
|
|
|
|
!ELF
|
|
FileHeader:
|
|
Class: ELFCLASS64
|
|
Data: ELFDATA2LSB
|
|
Type: ET_EXEC
|
|
Machine: EM_X86_64
|
|
Sections:
|
|
- Name: .text
|
|
Type: SHT_PROGBITS
|
|
Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
|
|
Address: 0x1000
|
|
AddressAlign: 0x1000
|
|
Size: 0x1000
|
|
- Name: .text2
|
|
Type: SHT_PROGBITS
|
|
Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
|
|
Address: 0x2000
|
|
AddressAlign: 0x1000
|
|
Size: 0x1000
|
|
- Name: .text3
|
|
Type: SHT_PROGBITS
|
|
Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
|
|
Address: 0x3000
|
|
AddressAlign: 0x1000
|
|
Size: 0x1000
|
|
ProgramHeaders:
|
|
- Type: PT_LOAD
|
|
Flags: [ PF_R ]
|
|
VAddr: 0x1000
|
|
PAddr: 0x1000
|
|
Sections:
|
|
- Section: .text
|
|
- Type: PT_LOAD
|
|
Flags: [ PF_X, PF_R ]
|
|
VAddr: 0x3000
|
|
PAddr: 0x3000
|
|
Sections:
|
|
- Section: .text3
|
|
|
|
# CHECK: ProgramHeaders [
|
|
# CHECK-NEXT: ProgramHeader {
|
|
# CHECK-NEXT: Type: PT_LOAD (0x1)
|
|
# CHECK-NEXT: Offset: 0x1000
|
|
# CHECK-NEXT: VirtualAddress: 0x1000
|
|
# CHECK-NEXT: PhysicalAddress: 0x1000
|
|
# CHECK-NEXT: FileSize: 4096
|
|
# CHECK-NEXT: MemSize: 4096
|
|
# CHECK-NEXT: Flags [ (0x4)
|
|
# CHECK-NEXT: PF_R (0x4)
|
|
# CHECK-NEXT: ]
|
|
# CHECK-NEXT: Alignment: 4096
|
|
# CHECK-NEXT: }
|
|
# CHECK-NEXT: ProgramHeader {
|
|
# CHECK-NEXT: Type: PT_LOAD (0x1)
|
|
# CHECK-NEXT: Offset: 0x2000
|
|
# CHECK-NEXT: VirtualAddress: 0x3000
|
|
# CHECK-NEXT: PhysicalAddress: 0x3000
|
|
# CHECK-NEXT: FileSize: 4096
|
|
# CHECK-NEXT: MemSize: 4096
|
|
# CHECK-NEXT: Flags [ (0x5)
|
|
# CHECK-NEXT: PF_R (0x4)
|
|
# CHECK-NEXT: PF_X (0x1)
|
|
# CHECK-NEXT: ]
|
|
# CHECK-NEXT: Alignment: 4096
|
|
# CHECK-NEXT: }
|
|
# CHECK-NEXT:]
|