Skip to content

Commit dcaaf52

Browse files
committed
RISC-V: Make T-Head testing pattern more generic
On some T-Head vendor extensions, we test against the constant 18446744073709551615 (2**64-1) to detect invalid immediate errors on -1. However, it heavily depends on the fact that the value used to print immediate value is a 64-bit unsigned type and this constant is not (and should not be) important (we just want to know that -1 is not valid). This commit replaces all such occurrences of 18446744073709551615 with a more generic regular expression. gas/ChangeLog: * testsuite/gas/riscv/x-thead-ba-fail.l: Replace 18446744073709551615 with generic regular expression. * testsuite/gas/riscv/x-thead-bb-fail.l: Likewise. * testsuite/gas/riscv/x-thead-bs-fail.l: Likewise. * testsuite/gas/riscv/x-thead-fmemidx-fail.l: Likewise. * testsuite/gas/riscv/x-thead-memidx-fail.l: Likewise. * testsuite/gas/riscv/x-thead-mempair-fail.l: Likewise.
1 parent 0386a29 commit dcaaf52

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.*: Assembler messages:
2-
.*: Error: improper immediate value \(18446744073709551615\)
2+
.*: Error: improper immediate value \(-?\d+\)
33
.*: Error: improper immediate value \(4\)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.*: Assembler messages:
2-
.*: Error: improper immediate value \(18446744073709551615\)
2+
.*: Error: improper immediate value \(-?\d+\)
33
.*: Error: improper immediate value \(64\)
4-
.*: Error: improper immediate value \(18446744073709551615\)
4+
.*: Error: improper immediate value \(-?\d+\)
55
.*: Error: improper immediate value \(32\)
66
.*: Error: illegal operands `th.ext a0,64,62'
77
.*: Error: illegal operands `th.extu a0,-1,0'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.*: Assembler messages:
2-
.*: Error: improper immediate value \(18446744073709551615\)
2+
.*: Error: improper immediate value \(-?\d+\)
33
.*: Error: improper immediate value \(64\)
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
.*: Assembler messages:
22
.*: Error: illegal operands `th.flrd a0,a1,a2,0'
3-
.*: Error: improper immediate value \(18446744073709551615\)
3+
.*: Error: improper immediate value \(-?\d+\)
44
.*: Error: improper immediate value \(4\)
5-
.*: Error: improper immediate value \(18446744073709551615\)
5+
.*: Error: improper immediate value \(-?\d+\)
66
.*: Error: improper immediate value \(4\)
7-
.*: Error: improper immediate value \(18446744073709551615\)
7+
.*: Error: improper immediate value \(-?\d+\)
88
.*: Error: improper immediate value \(4\)
9-
.*: Error: improper immediate value \(18446744073709551615\)
9+
.*: Error: improper immediate value \(-?\d+\)
1010
.*: Error: improper immediate value \(4\)
11-
.*: Error: improper immediate value \(18446744073709551615\)
11+
.*: Error: improper immediate value \(-?\d+\)
1212
.*: Error: improper immediate value \(4\)
13-
.*: Error: improper immediate value \(18446744073709551615\)
13+
.*: Error: improper immediate value \(-?\d+\)
1414
.*: Error: improper immediate value \(4\)
15-
.*: Error: improper immediate value \(18446744073709551615\)
15+
.*: Error: improper immediate value \(-?\d+\)
1616
.*: Error: improper immediate value \(4\)
17-
.*: Error: improper immediate value \(18446744073709551615\)
17+
.*: Error: improper immediate value \(-?\d+\)
1818
.*: Error: improper immediate value \(4\)
1919

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
.*: Assembler messages:
22
.*: Error: improper immediate value \(-17\)
3-
.*: Error: improper immediate value \(18446744073709551615\)
3+
.*: Error: improper immediate value \(-?\d+\)
44
.*: Error: improper immediate value \(16\)
55
.*: Error: improper immediate value \(4\)
66

77
.*: Error: illegal operands `th.ldia a0,\(a0\),0,0'
88
.*: Error: illegal operands `th.ldib a0,\(a0\),0,0'
99

10-
.*: Error: improper immediate value \(18446744073709551615\)
10+
.*: Error: improper immediate value \(-?\d+\)
1111
.*: Error: improper immediate value \(4\)
1212

13-
.*: Error: improper immediate value \(18446744073709551615\)
13+
.*: Error: improper immediate value \(-?\d+\)
1414
.*: Error: improper immediate value \(4\)

gas/testsuite/gas/riscv/x-thead-mempair-fail.l

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55
.*: Error: illegal operands `th.sdd a0,a1,\(a2\),3'
66
.*: Error: illegal operands `th.swd a0,a1,\(a2\),0'
77

8-
.*: Error: improper immediate value \(18446744073709551615\)
8+
.*: Error: improper immediate value \(-?\d+\)
99
.*: Error: improper immediate value \(4\)
1010
.*: Error: unexpected literal \(3\)
1111

12-
.*: Error: improper immediate value \(18446744073709551615\)
12+
.*: Error: improper immediate value \(-?\d+\)
1313
.*: Error: improper immediate value \(4\)
1414
.*: Error: unexpected literal \(4\)
1515

16-
.*: Error: improper immediate value \(18446744073709551615\)
16+
.*: Error: improper immediate value \(-?\d+\)
1717
.*: Error: improper immediate value \(4\)
1818
.*: Error: unexpected literal \(4\)
1919

20-
.*: Error: improper immediate value \(18446744073709551615\)
20+
.*: Error: improper immediate value \(-?\d+\)
2121
.*: Error: improper immediate value \(4\)
2222
.*: Error: unexpected literal \(3\)
2323

24-
.*: Error: improper immediate value \(18446744073709551615\)
24+
.*: Error: improper immediate value \(-?\d+\)
2525
.*: Error: improper immediate value \(4\)
2626
.*: Error: unexpected literal \(4\)
2727

0 commit comments

Comments
 (0)