Skip to content

Commit b7e019b

Browse files
androm3daandrom3da
committed
Fix jump/call targets
Since ac7ceb3 `[Hexagon][llvm-objdump] Improve disassembly of Hexagon bundles`, llvm-objdump includes detail about call targets, so we should expect to see those now.
1 parent 061758b commit b7e019b

File tree

5 files changed

+45
-45
lines changed

5 files changed

+45
-45
lines changed

‎lld/test/ELF/hexagon-thunk-range-b22rel.s

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,25 @@ target_beyond_range_min:
6868
## Verify thunk generation for targets beyond B22_PCREL range
6969
# CHECK: <__hexagon_thunk_target_within_range_min_from_.text.thunk>:
7070
# CHECK-NEXT: 200b4: { immext(#0x900000)
71-
# CHECK-NEXT: jump 0x9200cc }
71+
# CHECK-NEXT: jump 0x9200cc <target_within_range_min> }
7272

7373
# CHECK: <__hexagon_thunk_target_beyond_range_min_from_.text.thunk>:
7474
# CHECK-NEXT: 200bc: { immext(#0x1100000)
75-
# CHECK-NEXT: jump 0x11200c8 }
75+
# CHECK-NEXT: jump 0x11200c8 <target_beyond_range_min> }
7676

7777
# CHECK: <__hexagon_thunk_target_multiple_calls_from_.text.thunk>:
7878
# CHECK-NEXT: 200c4: { immext(#0x8fffc0)
79-
# CHECK-NEXT: jump 0x9200c0 }
79+
# CHECK-NEXT: jump 0x9200c0 <target_multiple_calls> }
8080

8181
## Verify _start calls - some direct, some via thunks
8282
# CHECK: <_start>:
83-
# CHECK-NEXT: 200cc: { call 0x8200ac }
84-
# CHECK-NEXT: { call 0x8200b8 }
85-
# CHECK-NEXT: { call 0x200b4 }
86-
# CHECK-NEXT: { call 0x200bc }
87-
# CHECK-NEXT: { call 0x200c4 }
88-
# CHECK-NEXT: { call 0x200c4 }
89-
# CHECK-NEXT: { call 0x200ec }
83+
# CHECK-NEXT: 200cc: { call 0x8200ac <target_within_range_max> }
84+
# CHECK-NEXT: { call 0x8200b8 <target_beyond_range> }
85+
# CHECK-NEXT: { call 0x200b4 <__hexagon_thunk_target_within_range_min_from_.text.thunk> }
86+
# CHECK-NEXT: { call 0x200bc <__hexagon_thunk_target_beyond_range_min_from_.text.thunk> }
87+
# CHECK-NEXT: { call 0x200c4 <__hexagon_thunk_target_multiple_calls_from_.text.thunk> }
88+
# CHECK-NEXT: { call 0x200c4 <__hexagon_thunk_target_multiple_calls_from_.text.thunk> }
89+
# CHECK-NEXT: { call 0x200ec <target_close> }
9090

9191
# CHECK: <target_close>:
9292
# CHECK-NEXT: 200ec: { jumpr r31 }
@@ -96,7 +96,7 @@ target_beyond_range_min:
9696
# CHECK-NEXT: 8200ac: { jumpr r31 }
9797

9898
# CHECK: <target_beyond_range>:
99-
# CHECK-NEXT: 8200b8: { call 0x8200ac }
99+
# CHECK-NEXT: 8200b8: { call 0x8200ac <target_within_range_max> }
100100
# CHECK-NEXT: { jumpr r31 }
101101

102102
# CHECK: <target_multiple_calls>:
@@ -105,10 +105,10 @@ target_beyond_range_min:
105105
## Verify targets in negative section and thunk for calling back to main section
106106
# CHECK: <__hexagon_thunk__from_.text.thunk>:
107107
# CHECK-NEXT: 9200c4: { immext(#0xff700000)
108-
# CHECK-NEXT: jump 0x200cc }
108+
# CHECK-NEXT: jump 0x200cc <_start> }
109109

110110
# CHECK: <target_within_range_min>:
111-
# CHECK-NEXT: 9200cc: { call 0x9200c4 }
111+
# CHECK-NEXT: 9200cc: { call 0x9200c4 <__hexagon_thunk__from_.text.thunk> }
112112
# CHECK-NEXT: { jumpr r31 }
113113

114114
# CHECK: <target_beyond_range_min>:

‎lld/test/ELF/hexagon-thunk-range-gdplt.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ tls_var_distant:
5252
# CHECK-NEXT: r2 = add(pc,##0x420130) }
5353
# CHECK-NEXT: { immext(#0xfffeffc0)
5454
# CHECK-NEXT: r0 = add(r2,##-0x10018) }
55-
# CHECK-NEXT: { call 0x410360 }
55+
# CHECK-NEXT: { call 0x410360 <__tls_get_addr@plt> }
5656
# CHECK-NEXT: { immext(#0xfffeffc0)
5757
# CHECK-NEXT: r0 = add(r2,##-0x10010) }
58-
# CHECK-NEXT: { call 0x410360 }
58+
# CHECK-NEXT: { call 0x410360 <__tls_get_addr@plt> }
5959
# CHECK-NEXT: { jumpr r31 }
6060

6161
# CHECK: <more_code>:
6262
# CHECK-NEXT: 4102f8: { immext(#0xfffeffc0)
6363
# CHECK-NEXT: r0 = add(r2,##-0x10008) }
64-
# CHECK-NEXT: { call 0x410360 }
64+
# CHECK-NEXT: { call 0x410360 <__tls_get_addr@plt> }
6565
# CHECK-NEXT: { jumpr r31 }
6666

6767
## Verify PLT entries are created for TLS

‎lld/test/ELF/hexagon-thunk-range-plt.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ _start:
3939

4040
# CHECK: Disassembly of section .text:
4141
# CHECK: <_start>:
42-
# CHECK-NEXT: 2021c: { call 0x220250 }
43-
# CHECK-NEXT: { call 0x220260 }
44-
# CHECK-NEXT: { call 0x220270 }
42+
# CHECK-NEXT: 2021c: { call 0x220250 <extern_within_range@plt> }
43+
# CHECK-NEXT: { call 0x220260 <extern_beyond_range@plt> }
44+
# CHECK-NEXT: { call 0x220270 <extern_close@plt> }
4545
# CHECK-NEXT: { jumpr r31 }
4646

4747
## Verify PLT header and entries are created with exact addresses

‎lld/test/ELF/hexagon-thunks-packets.s

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
# CHECK-NONPIC: 000200b4 <__hexagon_thunk_myfn_a_from_.text.thunk>:
1919
# CHECK-NONPIC: { immext(#0x1000040)
20-
# CHECK-NONPIC: jump 0x1020110 }
20+
# CHECK-NONPIC: jump 0x1020110 <myfn_a> }
2121

2222
# CHECK-PIC: 00010150 <__hexagon_thunk_myfn_a_from_.text.thunk>:
2323
# CHECK-PIC-NEXT: { immext(#0x1000040)
@@ -40,33 +40,33 @@ myfn_b:
4040
main:
4141
{ r0 = #0
4242
call myfn_a }
43-
# CHECK-PIC: { call 0x10150
44-
# CHECK-NONPIC: { call 0x200b4
43+
# CHECK-PIC: { call 0x10150 <__hexagon_thunk_myfn_a_from_.text.thunk>
44+
# CHECK-NONPIC: { call 0x200b4 <__hexagon_thunk_myfn_a_from_.text.thunk>
4545
# CHECK-NEXT: r0 = #0x0 }
4646
call myfn_a
47-
# CHECK-PIC: call 0x10150
48-
# CHECK-NONPIC: call 0x200b4
47+
# CHECK-PIC: call 0x10150 <__hexagon_thunk_myfn_a_from_.text.thunk>
48+
# CHECK-NONPIC: call 0x200b4 <__hexagon_thunk_myfn_a_from_.text.thunk>
4949
call myfn_b
50-
# CHECK-PIC-NEXT: call 0x1015c
51-
# CHECK-NONPIC-NEXT: call 0x200bc
50+
# CHECK-PIC-NEXT: call 0x1015c <myfn_b>
51+
# CHECK-NONPIC-NEXT: call 0x200bc <myfn_b>
5252

5353
{ r2 = add(r0, r1)
5454
if (p0) call #myfn_b
5555
if (!p0) call #myfn_a }
56-
# CHECK-PIC-NEXT: { if (p0) call 0x1015c
57-
# CHECK-PIC-NEXT: if (!p0) call 0x10150
58-
# CHECK-NONPIC-NEXT: { if (p0) call 0x200bc
59-
# CHECK-NONPIC-NEXT: if (!p0) call 0x200b4
56+
# CHECK-PIC-NEXT: { if (p0) call 0x1015c <myfn_b>
57+
# CHECK-PIC-NEXT: if (!p0) call 0x10150 <__hexagon_thunk_myfn_a_from_.text.thunk>
58+
# CHECK-NONPIC-NEXT: { if (p0) call 0x200bc <myfn_b>
59+
# CHECK-NONPIC-NEXT: if (!p0) call 0x200b4 <__hexagon_thunk_myfn_a_from_.text.thunk>
6060

6161
# CHECK-NEXT: r2 = add(r0,r1) }
6262

6363
{ r2 = add(r0, r1)
6464
if (p0) call #myfn_a
6565
if (!p0) call #myfn_a }
66-
# CHECK-PIC-NEXT: { if (p0) call 0x10150
67-
# CHECK-PIC-NEXT: if (!p0) call 0x10150
68-
# CHECK-NONPIC-NEXT: { if (p0) call 0x200b4
69-
# CHECK-NONPIC-NEXT: if (!p0) call 0x200b4
66+
# CHECK-PIC-NEXT: { if (p0) call 0x10150 <__hexagon_thunk_myfn_a_from_.text.thunk>
67+
# CHECK-PIC-NEXT: if (!p0) call 0x10150 <__hexagon_thunk_myfn_a_from_.text.thunk>
68+
# CHECK-NONPIC-NEXT: { if (p0) call 0x200b4 <__hexagon_thunk_myfn_a_from_.text.thunk>
69+
# CHECK-NONPIC-NEXT: if (!p0) call 0x200b4 <__hexagon_thunk_myfn_a_from_.text.thunk>
7070
# CHECK-NEXT: r2 = add(r0,r1) }
7171

7272
{ r2 = add(r0, r1)
@@ -83,18 +83,18 @@ main:
8383
if (r0 <= #0) jump:t #myfn_a
8484
p1 = cmp.eq(r0, #0); if (p1.new) jump:nt #myfn_a }
8585
# CHECK-NONPIC-NEXT: { if (r0<=#0) jump:t 0x200b4
86-
# CHECK-NONPIC-NEXT: p1 = cmp.eq(r0,#0x0); if (p1.new) jump:nt 0x200b4
86+
# CHECK-NONPIC-NEXT: p1 = cmp.eq(r0,#0x0); if (p1.new) jump:nt 0x200b4 <__hexagon_thunk_myfn_a_from_.text.thunk>
8787
# CHECK-PIC-NEXT: { if (r0<=#0) jump:t 0x10150
88-
# CHECK-PIC-NEXT: p1 = cmp.eq(r0,#0x0); if (p1.new) jump:nt 0x10150
88+
# CHECK-PIC-NEXT: p1 = cmp.eq(r0,#0x0); if (p1.new) jump:nt 0x10150 <__hexagon_thunk_myfn_a_from_.text.thunk>
8989
# CHECK-NEXT: r2 = add(r0,r1)
9090
# CHECK-NEXT: r4 = r5 }
9191

9292
{r0 = #0; jump #myfn_a}
93-
# CHECK-PIC-NEXT: { r0 = #0x0 ; jump 0x10150 }
94-
# CHECK-NONPIC-NEXT: { r0 = #0x0 ; jump 0x200b4 }
93+
# CHECK-PIC-NEXT: { r0 = #0x0 ; jump 0x10150 <__hexagon_thunk_myfn_a_from_.text.thunk> }
94+
# CHECK-NONPIC-NEXT: { r0 = #0x0 ; jump 0x200b4 <__hexagon_thunk_myfn_a_from_.text.thunk> }
9595
{r0 = #0; jump #myfn_b}
96-
# CHECK-PIC-NEXT: { r0 = #0x0 ; jump 0x1015c }
97-
# CHECK-NONPIC-NEXT: { r0 = #0x0 ; jump 0x200bc }
96+
# CHECK-PIC-NEXT: { r0 = #0x0 ; jump 0x1015c <myfn_b> }
97+
# CHECK-NONPIC-NEXT: { r0 = #0x0 ; jump 0x200bc <myfn_b> }
9898
jumpr r31
9999
.size main, .-main
100100

@@ -109,12 +109,12 @@ myfn_a:
109109
.size myfn_a, .-myfn_a
110110

111111
# CHECK-NONPIC: 01020110 <myfn_a>:
112-
# CHECK-NONPIC-NEXT: { r0 = #0x0 ; jump 0x1020118 }
112+
# CHECK-NONPIC-NEXT: { r0 = #0x0 ; jump 0x1020118 <__hexagon_thunk_myfn_b_from_.text.thunk> }
113113
# CHECK-NONPIC-NEXT: { jumpr r31 }
114114

115115
# CHECK-NONPIC: 01020118 <__hexagon_thunk_myfn_b_from_.text.thunk>:
116116
# CHECK-NONPIC-NEXT: { immext(#0xfeffff80)
117-
# CHECK-NONPIC-NEXT: jump 0x200bc }
117+
# CHECK-NONPIC-NEXT: jump 0x200bc <myfn_b> }
118118

119119
# CHECK-PIC: 010101b8 <__hexagon_thunk_myfn_b_from_.text.thunk>:
120120
# CHECK-PIC-NEXT: { immext(#0xfeffff80)

‎lld/test/ELF/hexagon-thunks.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ myfn:
3131

3232
# CHECK: <__hexagon_thunk_myfn_from_.text.thunk>:
3333
# CHECK-NONPIC-NEXT: 200b4: { immext(#0x1000000)
34-
# CHECK-NONPIC-NEXT: jump 0x10200bc }
34+
# CHECK-NONPIC-NEXT: jump 0x10200bc <myfn> }
3535
# CHECK-PIC-NEXT: 200b4: { immext(#0x1000000)
3636
# CHECK-PIC-NEXT: r14 = add(pc,##0x1000008) }
3737
# CHECK-PIC-NEXT: { jumpr r14 }
3838

3939
# CHECK-NONPIC: <main>:
40-
# CHECK-NONPIC-NEXT: 200bc: { call 0x200b4 }
40+
# CHECK-NONPIC-NEXT: 200bc: { call 0x200b4 <__hexagon_thunk_myfn_from_.text.thunk> }
4141
# CHECK-PIC: <main>:
42-
# CHECK-PIC-NEXT: 200c0: { call 0x200b4 }
42+
# CHECK-PIC-NEXT: 200c0: { call 0x200b4 <__hexagon_thunk_myfn_from_.text.thunk> }
4343
# CHECK-NEXT: { jumpr r31 }
4444

4545
# CHECK: Disassembly of section .text_high:

0 commit comments

Comments
 (0)