Skip to content

Commit c99c818

Browse files
e-kude-kud
committed
Fix arm tests that check thunk assembly
1 parent d83312c commit c99c818

File tree

2 files changed

+67
-67
lines changed

2 files changed

+67
-67
lines changed

‎lld/test/COFF/arm64ec-delayimport.test‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -51,28 +51,28 @@ DISASM-NEXT: 180002016: 48 8d 05 6b 50 00 00 leaq 0x506b(%rip), %rax
5151
DISASM-NEXT: 18000201d: e9 0c 00 00 00 jmp 0x18000202e <.text+0x102e>
5252
DISASM-NEXT: 180002022: 48 8d 05 67 50 00 00 leaq 0x5067(%rip), %rax # 0x180007090
5353
DISASM-NEXT: 180002029: e9 00 00 00 00 jmp 0x18000202e <.text+0x102e>
54-
DISASM-NEXT: 18000202e: 51 pushq %rcx
55-
DISASM-NEXT: 18000202f: 52 pushq %rdx
56-
DISASM-NEXT: 180002030: 41 50 pushq %r8
57-
DISASM-NEXT: 180002032: 41 51 pushq %r9
58-
DISASM-NEXT: 180002034: 48 83 ec 48 subq $0x48, %rsp
59-
DISASM-NEXT: 180002038: 66 0f 7f 04 24 movdqa %xmm0, (%rsp)
60-
DISASM-NEXT: 18000203d: 66 0f 7f 4c 24 10 movdqa %xmm1, 0x10(%rsp)
61-
DISASM-NEXT: 180002043: 66 0f 7f 54 24 20 movdqa %xmm2, 0x20(%rsp)
62-
DISASM-NEXT: 180002049: 66 0f 7f 5c 24 30 movdqa %xmm3, 0x30(%rsp)
63-
DISASM-NEXT: 18000204f: 48 8b d0 movq %rax, %rdx
64-
DISASM-NEXT: 180002052: 48 8d 0d a7 21 00 00 leaq 0x21a7(%rip), %rcx # 0x180004200
65-
DISASM-NEXT: 180002059: e8 aa ef ff ff callq 0x180001008 <.text+0x8>
66-
DISASM-NEXT: 18000205e: 66 0f 6f 04 24 movdqa (%rsp), %xmm0
67-
DISASM-NEXT: 180002063: 66 0f 6f 4c 24 10 movdqa 0x10(%rsp), %xmm1
68-
DISASM-NEXT: 180002069: 66 0f 6f 54 24 20 movdqa 0x20(%rsp), %xmm2
69-
DISASM-NEXT: 18000206f: 66 0f 6f 5c 24 30 movdqa 0x30(%rsp), %xmm3
70-
DISASM-NEXT: 180002075: 48 83 c4 48 addq $0x48, %rsp
71-
DISASM-NEXT: 180002079: 41 59 popq %r9
72-
DISASM-NEXT: 18000207b: 41 58 popq %r8
73-
DISASM-NEXT: 18000207d: 5a popq %rdx
74-
DISASM-NEXT: 18000207e: 59 popq %rcx
75-
DISASM-NEXT: 18000207f: ff e0 jmpq *%rax
54+
DISASM-NEXT: 18000202e: 48 89 4c 24 08 movq %rcx, 0x8(%rsp)
55+
DISASM-NEXT: 180002033: 48 89 54 24 10 movq %rdx, 0x10(%rsp)
56+
DISASM-NEXT: 180002038: 4c 89 44 24 18 movq %r8, 0x18(%rsp)
57+
DISASM-NEXT: 18000203d: 4c 89 4c 24 20 movq %r9, 0x20(%rsp)
58+
DISASM-NEXT: 180002042: 48 83 ec 68 subq $0x68, %rsp
59+
DISASM-NEXT: 180002046: 66 0f 7f 44 24 20 movdqa %xmm0, 0x20(%rsp)
60+
DISASM-NEXT: 18000204c: 66 0f 7f 4c 24 30 movdqa %xmm1, 0x30(%rsp)
61+
DISASM-NEXT: 180002052: 66 0f 7f 54 24 40 movdqa %xmm2, 0x40(%rsp)
62+
DISASM-NEXT: 180002058: 66 0f 7f 5c 24 50 movdqa %xmm3, 0x50(%rsp)
63+
DISASM-NEXT: 18000205e: 48 8b d0 movq %rax, %rdx
64+
DISASM-NEXT: 180002061: 48 8d 0d 98 21 00 00 leaq 0x2198(%rip), %rcx # 0x180004200
65+
DISASM-NEXT: 180002068: e8 9b ef ff ff callq 0x180001008 <.text+0x8>
66+
DISASM-NEXT: 18000206d: 66 0f 6f 44 24 20 movdqa 0x20(%rsp), %xmm0
67+
DISASM-NEXT: 180002073: 66 0f 6f 4c 24 30 movdqa 0x30(%rsp), %xmm1
68+
DISASM-NEXT: 180002079: 66 0f 6f 54 24 40 movdqa 0x40(%rsp), %xmm2
69+
DISASM-NEXT: 18000207f: 66 0f 6f 5c 24 50 movdqa 0x50(%rsp), %xmm3
70+
DISASM-NEXT: 180002085: 48 8b 4c 24 70 movq 0x70(%rsp), %rcx
71+
DISASM-NEXT: 18000208a: 48 8b 54 24 78 movq 0x78(%rsp), %rdx
72+
DISASM-NEXT: 18000208f: 4c 8b 84 24 80 00 00 00 movq 0x80(%rsp), %r8
73+
DISASM-NEXT: 180002097: 4c 8b 8c 24 88 00 00 00 movq 0x88(%rsp), %r9
74+
DISASM-NEXT: 18000209f: 48 83 c4 68 addq $0x68, %rsp
75+
DISASM-NEXT: 1800020a3: ff e0 jmpq *%rax
7676

7777
RUN: llvm-readobj --coff-load-config out.dll | FileCheck --check-prefix=LOADCFG %s
7878
LOADCFG: CHPEMetadata [
@@ -141,7 +141,7 @@ RELOC-NEXT: Address: 0x6008
141141
RELOC-NEXT: }
142142

143143
RUN: llvm-readobj --hex-dump=.pdata out.dll | FileCheck --check-prefix=PDATA %s
144-
PDATA: 0x180008000 2e200000 81200000 18400000
144+
PDATA: 0x180008000 2e200000 a5200000 18400000
145145

146146
Verify that a demangled version of __delayLoadHelper2 can be used.
147147

‎lld/test/COFF/arm64x-delayimport.test‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -105,28 +105,28 @@ DISASM-NEXT: ...
105105
DISASM-NEXT: 180003000: ff 25 92 30 00 00 jmpq *0x3092(%rip) # 0x180006098
106106
DISASM-NEXT: 180003006: 48 8d 05 8b 30 00 00 leaq 0x308b(%rip), %rax # 0x180006098
107107
DISASM-NEXT: 18000300d: e9 00 00 00 00 jmp 0x180003012 <.text+0x2012>
108-
DISASM-NEXT: 180003012: 51 pushq %rcx
109-
DISASM-NEXT: 180003013: 52 pushq %rdx
110-
DISASM-NEXT: 180003014: 41 50 pushq %r8
111-
DISASM-NEXT: 180003016: 41 51 pushq %r9
112-
DISASM-NEXT: 180003018: 48 83 ec 48 subq $0x48, %rsp
113-
DISASM-NEXT: 18000301c: 66 0f 7f 04 24 movdqa %xmm0, (%rsp)
114-
DISASM-NEXT: 180003021: 66 0f 7f 4c 24 10 movdqa %xmm1, 0x10(%rsp)
115-
DISASM-NEXT: 180003027: 66 0f 7f 54 24 20 movdqa %xmm2, 0x20(%rsp)
116-
DISASM-NEXT: 18000302d: 66 0f 7f 5c 24 30 movdqa %xmm3, 0x30(%rsp)
117-
DISASM-NEXT: 180003033: 48 8b d0 movq %rax, %rdx
118-
DISASM-NEXT: 180003036: 48 8d 0d 13 13 00 00 leaq 0x1313(%rip), %rcx # 0x180004350
119-
DISASM-NEXT: 18000303d: e8 c6 ef ff ff callq 0x180002008 <.text+0x1008>
120-
DISASM-NEXT: 180003042: 66 0f 6f 04 24 movdqa (%rsp), %xmm0
121-
DISASM-NEXT: 180003047: 66 0f 6f 4c 24 10 movdqa 0x10(%rsp), %xmm1
122-
DISASM-NEXT: 18000304d: 66 0f 6f 54 24 20 movdqa 0x20(%rsp), %xmm2
123-
DISASM-NEXT: 180003053: 66 0f 6f 5c 24 30 movdqa 0x30(%rsp), %xmm3
124-
DISASM-NEXT: 180003059: 48 83 c4 48 addq $0x48, %rsp
125-
DISASM-NEXT: 18000305d: 41 59 popq %r9
126-
DISASM-NEXT: 18000305f: 41 58 popq %r8
127-
DISASM-NEXT: 180003061: 5a popq %rdx
128-
DISASM-NEXT: 180003062: 59 popq %rcx
129-
DISASM-NEXT: 180003063: ff e0 jmpq *%rax
108+
DISASM-NEXT: 180003012: 48 89 4c 24 08 movq %rcx, 0x8(%rsp)
109+
DISASM-NEXT: 180003017: 48 89 54 24 10 movq %rdx, 0x10(%rsp)
110+
DISASM-NEXT: 18000301c: 4c 89 44 24 18 movq %r8, 0x18(%rsp)
111+
DISASM-NEXT: 180003021: 4c 89 4c 24 20 movq %r9, 0x20(%rsp)
112+
DISASM-NEXT: 180003026: 48 83 ec 68 subq $0x68, %rsp
113+
DISASM-NEXT: 18000302a: 66 0f 7f 44 24 20 movdqa %xmm0, 0x20(%rsp)
114+
DISASM-NEXT: 180003030: 66 0f 7f 4c 24 30 movdqa %xmm1, 0x30(%rsp)
115+
DISASM-NEXT: 180003036: 66 0f 7f 54 24 40 movdqa %xmm2, 0x40(%rsp)
116+
DISASM-NEXT: 18000303c: 66 0f 7f 5c 24 50 movdqa %xmm3, 0x50(%rsp)
117+
DISASM-NEXT: 180003042: 48 8b d0 movq %rax, %rdx
118+
DISASM-NEXT: 180003045: 48 8d 0d 04 13 00 00 leaq 0x1304(%rip), %rcx # 0x180004350
119+
DISASM-NEXT: 18000304c: e8 b7 ef ff ff callq 0x180002008 <.text+0x1008>
120+
DISASM-NEXT: 180003051: 66 0f 6f 44 24 20 movdqa 0x20(%rsp), %xmm0
121+
DISASM-NEXT: 180003057: 66 0f 6f 4c 24 30 movdqa 0x30(%rsp), %xmm1
122+
DISASM-NEXT: 18000305d: 66 0f 6f 54 24 40 movdqa 0x40(%rsp), %xmm2
123+
DISASM-NEXT: 180003063: 66 0f 6f 5c 24 50 movdqa 0x50(%rsp), %xmm3
124+
DISASM-NEXT: 180003069: 48 8b 4c 24 70 movq 0x70(%rsp), %rcx
125+
DISASM-NEXT: 18000306e: 48 8b 54 24 78 movq 0x78(%rsp), %rdx
126+
DISASM-NEXT: 180003073: 4c 8b 84 24 80 00 00 00 movq 0x80(%rsp), %r8
127+
DISASM-NEXT: 18000307b: 4c 8b 8c 24 88 00 00 00 movq 0x88(%rsp), %r9
128+
DISASM-NEXT: 180003083: 48 83 c4 68 addq $0x68, %rsp
129+
DISASM-NEXT: 180003087: ff e0 jmpq *%rax
130130

131131
RUN: llvm-readobj --coff-load-config out.dll | FileCheck --check-prefix=LOADCFG %s
132132
LOADCFG: AuxiliaryDelayloadIAT: 0x5000
@@ -279,28 +279,28 @@ EC-DISASM-NEXT: ...
279279
EC-DISASM-NEXT: 180003000: ff 25 8a 30 00 00 jmpq *0x308a(%rip) # 0x180006090
280280
EC-DISASM-NEXT: 180003006: 48 8d 05 83 30 00 00 leaq 0x3083(%rip), %rax # 0x180006090
281281
EC-DISASM-NEXT: 18000300d: e9 00 00 00 00 jmp 0x180003012 <.text+0x2012>
282-
EC-DISASM-NEXT: 180003012: 51 pushq %rcx
283-
EC-DISASM-NEXT: 180003013: 52 pushq %rdx
284-
EC-DISASM-NEXT: 180003014: 41 50 pushq %r8
285-
EC-DISASM-NEXT: 180003016: 41 51 pushq %r9
286-
EC-DISASM-NEXT: 180003018: 48 83 ec 48 subq $0x48, %rsp
287-
EC-DISASM-NEXT: 18000301c: 66 0f 7f 04 24 movdqa %xmm0, (%rsp)
288-
EC-DISASM-NEXT: 180003021: 66 0f 7f 4c 24 10 movdqa %xmm1, 0x10(%rsp)
289-
EC-DISASM-NEXT: 180003027: 66 0f 7f 54 24 20 movdqa %xmm2, 0x20(%rsp)
290-
EC-DISASM-NEXT: 18000302d: 66 0f 7f 5c 24 30 movdqa %xmm3, 0x30(%rsp)
291-
EC-DISASM-NEXT: 180003033: 48 8b d0 movq %rax, %rdx
292-
EC-DISASM-NEXT: 180003036: 48 8d 0d 0b 13 00 00 leaq 0x130b(%rip), %rcx # 0x180004348
293-
EC-DISASM-NEXT: 18000303d: e8 c6 ef ff ff callq 0x180002008 <.text+0x1008>
294-
EC-DISASM-NEXT: 180003042: 66 0f 6f 04 24 movdqa (%rsp), %xmm0
295-
EC-DISASM-NEXT: 180003047: 66 0f 6f 4c 24 10 movdqa 0x10(%rsp), %xmm1
296-
EC-DISASM-NEXT: 18000304d: 66 0f 6f 54 24 20 movdqa 0x20(%rsp), %xmm2
297-
EC-DISASM-NEXT: 180003053: 66 0f 6f 5c 24 30 movdqa 0x30(%rsp), %xmm3
298-
EC-DISASM-NEXT: 180003059: 48 83 c4 48 addq $0x48, %rsp
299-
EC-DISASM-NEXT: 18000305d: 41 59 popq %r9
300-
EC-DISASM-NEXT: 18000305f: 41 58 popq %r8
301-
EC-DISASM-NEXT: 180003061: 5a popq %rdx
302-
EC-DISASM-NEXT: 180003062: 59 popq %rcx
303-
EC-DISASM-NEXT: 180003063: ff e0 jmpq *%rax
282+
EC-DISASM-NEXT: 180003012: 48 89 4c 24 08 movq %rcx, 0x8(%rsp)
283+
EC-DISASM-NEXT: 180003017: 48 89 54 24 10 movq %rdx, 0x10(%rsp)
284+
EC-DISASM-NEXT: 18000301c: 4c 89 44 24 18 movq %r8, 0x18(%rsp)
285+
EC-DISASM-NEXT: 180003021: 4c 89 4c 24 20 movq %r9, 0x20(%rsp)
286+
EC-DISASM-NEXT: 180003026: 48 83 ec 68 subq $0x68, %rsp
287+
EC-DISASM-NEXT: 18000302a: 66 0f 7f 44 24 20 movdqa %xmm0, 0x20(%rsp)
288+
EC-DISASM-NEXT: 180003030: 66 0f 7f 4c 24 30 movdqa %xmm1, 0x30(%rsp)
289+
EC-DISASM-NEXT: 180003036: 66 0f 7f 54 24 40 movdqa %xmm2, 0x40(%rsp)
290+
EC-DISASM-NEXT: 18000303c: 66 0f 7f 5c 24 50 movdqa %xmm3, 0x50(%rsp)
291+
EC-DISASM-NEXT: 180003042: 48 8b d0 movq %rax, %rdx
292+
EC-DISASM-NEXT: 180003045: 48 8d 0d fc 12 00 00 leaq 0x12fc(%rip), %rcx # 0x180004348
293+
EC-DISASM-NEXT: 18000304c: e8 b7 ef ff ff callq 0x180002008 <.text+0x1008>
294+
EC-DISASM-NEXT: 180003051: 66 0f 6f 44 24 20 movdqa 0x20(%rsp), %xmm0
295+
EC-DISASM-NEXT: 180003057: 66 0f 6f 4c 24 30 movdqa 0x30(%rsp), %xmm1
296+
EC-DISASM-NEXT: 18000305d: 66 0f 6f 54 24 40 movdqa 0x40(%rsp), %xmm2
297+
EC-DISASM-NEXT: 180003063: 66 0f 6f 5c 24 50 movdqa 0x50(%rsp), %xmm3
298+
EC-DISASM-NEXT: 180003069: 48 8b 4c 24 70 movq 0x70(%rsp), %rcx
299+
EC-DISASM-NEXT: 18000306e: 48 8b 54 24 78 movq 0x78(%rsp), %rdx
300+
EC-DISASM-NEXT: 180003073: 4c 8b 84 24 80 00 00 00 movq 0x80(%rsp), %r8
301+
EC-DISASM-NEXT: 18000307b: 4c 8b 8c 24 88 00 00 00 movq 0x88(%rsp), %r9
302+
EC-DISASM-NEXT: 180003083: 48 83 c4 68 addq $0x68, %rsp
303+
EC-DISASM-NEXT: 180003087: ff e0 jmpq *%rax
304304

305305
RUN: llvm-readobj --coff-load-config out-ec.dll | FileCheck --check-prefix=EC-LOADCFG %s
306306
EC-LOADCFG: AuxiliaryDelayloadIAT: 0x5000

0 commit comments

Comments
 (0)