Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-23 13:50:11 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[LLD] [COFF] Set the right alignment for DelayDirectoryChunk (#84697)

Browse Source 
This makes a difference when linking executables with delay loaded
libraries for arm32; the delay loader implementation can load data from
the registry with instructions that assume alignment.

This issue does not show up when linking in MinGW mode, because a
PseudoRelocTableChunk gets injected, which also sets alignment, even if
the chunk itself is empty.

(cherry picked from commit c93c76b562784926b22a69d3f82a5032dcb4a274)
This commit is contained in:
Martin Storsjö 2024-03-12 00:03:26 +02:00 committed by Tom Stellard
parent fcc33dca02
commit 2fc8bea42f
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/COFF/DLL.cpp
View File

@ -172,7 +172,7 @@ binImports(COFFLinkerContext &ctx,
// A chunk for the delay import descriptor table etnry. // A chunk for the delay import descriptor table etnry.
class DelayDirectoryChunk : public NonSectionChunk { class DelayDirectoryChunk : public NonSectionChunk {
public: public:
explicit DelayDirectoryChunk(Chunk *n) : dllName(n) {} explicit DelayDirectoryChunk(Chunk *n) : dllName(n) { setAlignment(4); }
size_t getSize() const override { size_t getSize() const override {
return sizeof(delay_import_directory_table_entry); return sizeof(delay_import_directory_table_entry);

25
lld/test/COFF/delayimports-armnt.yaml
View File

@ -6,6 +6,7 @@
# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s # RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s # RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
# RUN: llvm-objdump --no-print-imm-hex -d %t.exe | FileCheck --check-prefix=DISASM %s # RUN: llvm-objdump --no-print-imm-hex -d %t.exe | FileCheck --check-prefix=DISASM %s
# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=DIR %s
# IMPORT: Format: COFF-ARM # IMPORT: Format: COFF-ARM
# IMPORT-NEXT: Arch: thumb # IMPORT-NEXT: Arch: thumb
@ -13,9 +14,9 @@
# IMPORT-NEXT: DelayImport { # IMPORT-NEXT: DelayImport {
# IMPORT-NEXT: Name: library.dll # IMPORT-NEXT: Name: library.dll
# IMPORT-NEXT: Attributes: 0x1 # IMPORT-NEXT: Attributes: 0x1
# IMPORT-NEXT: ModuleHandle: 0x3000 # IMPORT-NEXT: ModuleHandle: 0x3008
# IMPORT-NEXT: ImportAddressTable: 0x3008 # IMPORT-NEXT: ImportAddressTable: 0x3010
# IMPORT-NEXT: ImportNameTable: 0x2040 # IMPORT-NEXT: ImportNameTable: 0x2044
# IMPORT-NEXT: BoundDelayImportTable: 0x0 # IMPORT-NEXT: BoundDelayImportTable: 0x0
# IMPORT-NEXT: UnloadDelayImportTable: 0x0 # IMPORT-NEXT: UnloadDelayImportTable: 0x0
# IMPORT-NEXT: Import { # IMPORT-NEXT: Import {
@ -43,7 +44,7 @@
# BASEREL-NEXT: } # BASEREL-NEXT: }
# BASEREL-NEXT: Entry { # BASEREL-NEXT: Entry {
# BASEREL-NEXT: Type: HIGHLOW # BASEREL-NEXT: Type: HIGHLOW
# BASEREL-NEXT: Address: 0x3008 # BASEREL-NEXT: Address: 0x3010
# BASEREL-NEXT: } # BASEREL-NEXT: }
# BASEREL-NEXT: Entry { # BASEREL-NEXT: Entry {
# BASEREL-NEXT: Type: ABSOLUTE # BASEREL-NEXT: Type: ABSOLUTE
@ -52,20 +53,24 @@
# BASEREL-NEXT: ] # BASEREL-NEXT: ]
# #
# DISASM: 00401000 <.text>: # DISASM: 00401000 <.text>:
# DISASM: 40100c: f243 0c08 movw r12, #12296 # DISASM: 40100c: f243 0c10 movw r12, #12304
# DISASM-NEXT: f2c0 0c40 movt r12, #64 # DISASM-NEXT: f2c0 0c40 movt r12, #64
# DISASM-NEXT: f000 b800 b.w {{.+}} @ imm = #0 # DISASM-NEXT: f000 b800 b.w {{.+}} @ imm = #0
# DISASM-NEXT: e92d 480f push.w {r0, r1, r2, r3, r11, lr} # DISASM-NEXT: e92d 480f push.w {r0, r1, r2, r3, r11, lr}
# DISASM-NEXT: f20d 0b10 addw r11, sp, #16 # DISASM-NEXT: f20d 0b10 addw r11, sp, #16
# DISASM-NEXT: ed2d 0b10 vpush {d0, d1, d2, d3, d4, d5, d6, d7} # DISASM-NEXT: ed2d 0b10 vpush {d0, d1, d2, d3, d4, d5, d6, d7}
# DISASM-NEXT: 4661 mov r1, r12 # DISASM-NEXT: 4661 mov r1, r12
# DISASM-NEXT: f242 0000 movw r0, #8192 # DISASM-NEXT: f242 0004 movw r0, #8196
# DISASM-NEXT: f2c0 0040 movt r0, #64 # DISASM-NEXT: f2c0 0040 movt r0, #64
# DISASM-NEXT: f7ff ffe7 bl 0x401000 <.text> # DISASM-NEXT: f7ff ffe7 bl 0x401000 <.text>
# DISASM-NEXT: 4684 mov r12, r0 # DISASM-NEXT: 4684 mov r12, r0
# DISASM-NEXT: ecbd 0b10 vpop {d0, d1, d2, d3, d4, d5, d6, d7} # DISASM-NEXT: ecbd 0b10 vpop {d0, d1, d2, d3, d4, d5, d6, d7}
# DISASM-NEXT: e8bd 480f pop.w {r0, r1, r2, r3, r11, lr} # DISASM-NEXT: e8bd 480f pop.w {r0, r1, r2, r3, r11, lr}
# DISASM-NEXT: 4760 bx r12 # DISASM-NEXT: 4760 bx r12
#
# DIR: DelayImportDescriptorRVA: 0x2004
# DIR-NEXT: DelayImportDescriptorSize: 0x40
--- !COFF --- !COFF
header: header:
@ -80,6 +85,14 @@ sections:
- VirtualAddress: 0 - VirtualAddress: 0
SymbolName: __imp_function SymbolName: __imp_function
Type: IMAGE_REL_ARM_MOV32T Type: IMAGE_REL_ARM_MOV32T
- Name: .rdata
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
Alignment: 1
SectionData: 01
- Name: .data
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
Alignment: 1
SectionData: 02
symbols: symbols:
- Name: .text - Name: .text
Value: 0 Value: 0