Skip to content

Commit 3e10905

Browse files
committed
[NFC][test] Fix for riscv tests.
Following tests need updating for: https://reviews.llvm.org/D55277 llvm-svn: 366183
1 parent c0b2ed6 commit 3e10905

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

lld/test/ELF/riscv-call.s

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
# RUN: llvm-objdump -d %t.rv32 | FileCheck %s
99
# RUN: llvm-objdump -d %t.rv64 | FileCheck %s
1010
# CHECK: 97 00 00 00 auipc ra, 0
11-
# CHECK-NEXT: e7 80 80 00 jalr ra, ra, 8
11+
# CHECK-NEXT: e7 80 80 00 jalr 8(ra)
1212
# CHECK: 97 00 00 00 auipc ra, 0
13-
# CHECK-NEXT: e7 80 80 ff jalr ra, ra, -8
13+
# CHECK-NEXT: e7 80 80 ff jalr -8(ra)
1414

1515
# RUN: ld.lld %t.rv32.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+8-0x80000800 -o %t.rv32.limits
1616
# RUN: ld.lld %t.rv64.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+8-0x80000800 -o %t.rv64.limits
1717
# RUN: llvm-objdump -d %t.rv32.limits | FileCheck --check-prefix=LIMITS %s
1818
# RUN: llvm-objdump -d %t.rv64.limits | FileCheck --check-prefix=LIMITS %s
1919
# LIMITS: 97 f0 ff 7f auipc ra, 524287
20-
# LIMITS-NEXT: e7 80 f0 7f jalr ra, ra, 2047
20+
# LIMITS-NEXT: e7 80 f0 7f jalr 2047(ra)
2121
# LIMITS-NEXT: 97 00 00 80 auipc ra, 524288
22-
# LIMITS-NEXT: e7 80 00 80 jalr ra, ra, -2048
22+
# LIMITS-NEXT: e7 80 00 80 jalr -2048(ra)
2323

2424
# RUN: ld.lld %t.rv32.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+8-0x80000801 -o %t
2525
# RUN: not ld.lld %t.rv64.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+8-0x80000801 -o %t 2>&1 | FileCheck --check-prefix=ERROR %s

lld/test/ELF/riscv-plt.s

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@
4747
## Direct call
4848
## foo - . = 0x11020-0x11000 = 32
4949
# DIS-NEXT: auipc ra, 0
50-
# DIS-NEXT: 11004: jalr ra, ra, 32
50+
# DIS-NEXT: 11004: jalr 32(ra)
5151
## bar@plt - . = 0x11050-0x1100c = 72
5252
# DIS-NEXT: auipc ra, 0
53-
# DIS-NEXT: 1100c: jalr ra, ra, 72
53+
# DIS-NEXT: 1100c: jalr 72(ra)
5454
## bar@plt - . = 0x11050-0x11014 = 64
5555
# DIS-NEXT: auipc ra, 0
56-
# DIS-NEXT: 11014: jalr ra, ra, 64
56+
# DIS-NEXT: 11014: jalr 64(ra)
5757
## weak@plt - . = 0x11060-0x1101c = 72
5858
# DIS-NEXT: auipc ra, 0
59-
# DIS-NEXT: 1101c: jalr ra, ra, 72
59+
# DIS-NEXT: 1101c: jalr 72(ra)
6060
# DIS: foo:
6161
# DIS-NEXT: 11020:
6262

@@ -79,14 +79,14 @@
7979
# DIS: 11050: auipc t3, 2
8080
# DIS32-NEXT: lw t3, -72(t3)
8181
# DIS64-NEXT: ld t3, -64(t3)
82-
# DIS-NEXT: jalr t1, t3, 0
82+
# DIS-NEXT: jalr t1, t3
8383
# DIS-NEXT: nop
8484

8585
## 32-bit: &.got.plt[weak]-. = 0x1300c-0x11060 = 4096*2-84
8686
# DIS: 11060: auipc t3, 2
8787
# DIS32-NEXT: lw t3, -84(t3)
8888
# DIS64-NEXT: ld t3, -72(t3)
89-
# DIS-NEXT: jalr t1, t3, 0
89+
# DIS-NEXT: jalr t1, t3
9090
# DIS-NEXT: nop
9191

9292
.global _start, foo, bar

lld/test/ELF/riscv-tls-gd.s

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@
5656
# GD32: 1000: auipc a0, 1
5757
# GD32-NEXT: addi a0, a0, 112
5858
# GD32-NEXT: auipc ra, 0
59-
# GD32-NEXT: jalr ra, ra, 56
59+
# GD32-NEXT: jalr 56(ra)
6060

6161
## &DTPMOD(b) - . = 0x2078 - 0x1010 = 4096*1+104
6262
# GD32: 1010: auipc a0, 1
6363
# GD32-NEXT: addi a0, a0, 104
6464
# GD32-NEXT: auipc ra, 0
65-
# GD32-NEXT: jalr ra, ra, 40
65+
# GD32-NEXT: jalr 40(ra)
6666

6767
# GD64-REL: .rela.dyn {
6868
# GD64-REL-NEXT: 0x20E0 R_RISCV_TLS_DTPMOD64 a 0x0
@@ -75,13 +75,13 @@
7575
# GD64: 1000: auipc a0, 1
7676
# GD64-NEXT: addi a0, a0, 224
7777
# GD64-NEXT: auipc ra, 0
78-
# GD64-NEXT: jalr ra, ra, 56
78+
# GD64-NEXT: jalr 56(ra)
7979

8080
## &DTPMOD(b) - . = 0x20f0 - 0x1010 = 4096*1+224
8181
# GD64: 1010: auipc a0, 1
8282
# GD64-NEXT: addi a0, a0, 224
8383
# GD64-NEXT: auipc ra, 0
84-
# GD64-NEXT: jalr ra, ra, 40
84+
# GD64-NEXT: jalr 40(ra)
8585

8686
# NOREL: no relocations
8787

lld/test/ELF/riscv-tls-ld.s

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# LD32-NEXT: addi a0, a0, 124
5656
# LD64-NEXT: addi a0, a0, 248
5757
# LD-NEXT: auipc ra, 0
58-
# LD-NEXT: jalr ra, ra, 56
58+
# LD-NEXT: jalr 56(ra)
5959

6060
# NOREL: no relocations
6161

@@ -74,7 +74,7 @@
7474
# LE32-NEXT: addi a0, a0, 4
7575
# LE64-NEXT: addi a0, a0, 8
7676
# LE-NEXT: auipc ra, 0
77-
# LE-NEXT: jalr ra, ra, 24
77+
# LE-NEXT: jalr 24(ra)
7878

7979
la.tls.gd a0, .LANCHOR0
8080
call __tls_get_addr@plt

0 commit comments

Comments
 (0)