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.

diff --git a/gas/testsuite/gas/riscv/x-thead-ba-fail.l b/gas/testsuite/gas/riscv/x-thead-ba-fail.l
index 4bb12e7f6423f8d6ffebabba7c005e1980e1726d..bfafe4590e5fb773e3383e38c3b04cc25f3987a0 100644 (file)
--- a/gas/testsuite/gas/riscv/x-thead-ba-fail.l
+++ b/gas/testsuite/gas/riscv/x-thead-ba-fail.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)

diff --git a/gas/testsuite/gas/riscv/x-thead-bb-fail.l b/gas/testsuite/gas/riscv/x-thead-bb-fail.l
index dd4a0df664ebbf15a8405632d4821c6ddbd7e29d..cde1c22ad253aa64806a90610649bc4378be4dbe 100644 (file)
--- a/gas/testsuite/gas/riscv/x-thead-bb-fail.l
+++ b/gas/testsuite/gas/riscv/x-thead-bb-fail.l
@@ -1,7 +1,7 @@
 .*: Assembler messages:
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(64\)
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(32\)
 .*: Error: illegal operands `th.ext a0,64,62'
 .*: Error: illegal operands `th.extu a0,-1,0'

diff --git a/gas/testsuite/gas/riscv/x-thead-bs-fail.l b/gas/testsuite/gas/riscv/x-thead-bs-fail.l
index c8a7ff4e7f14bdb8076a5e095e49d6125ed275c8..200218480c844f4d4f2e03fa53d8d4547a5235b3 100644 (file)
--- a/gas/testsuite/gas/riscv/x-thead-bs-fail.l
+++ b/gas/testsuite/gas/riscv/x-thead-bs-fail.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(64\)

diff --git a/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l b/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l
index 33cddac856e5b944664bf874b664f4d15d4890c5..4d40f66f399862a3075257c8ae8e4fd1471f3e82 100644 (file)
--- a/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l
+++ b/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l
@@ -1,19 +1,19 @@
 .*: Assembler messages:
 .*: Error: illegal operands `th.flrd a0,a1,a2,0'
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
 

diff --git a/gas/testsuite/gas/riscv/x-thead-memidx-fail.l b/gas/testsuite/gas/riscv/x-thead-memidx-fail.l
index c6bd25c0268cbaa20ae4980924b38e039ebe52b4..44ca58bbf2cd16c6b065995aa96c239f8fc1a01f 100644 (file)
--- a/gas/testsuite/gas/riscv/x-thead-memidx-fail.l
+++ b/gas/testsuite/gas/riscv/x-thead-memidx-fail.l
@@ -1,14 +1,14 @@
 .*: Assembler messages:
 .*: Error: improper immediate value \(-17\)
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(16\)
 .*: Error: improper immediate value \(4\)
 
 .*: Error: illegal operands `th.ldia a0,\(a0\),0,0'
 .*: Error: illegal operands `th.ldib a0,\(a0\),0,0'
 
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
 
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)

diff --git a/gas/testsuite/gas/riscv/x-thead-mempair-fail.l b/gas/testsuite/gas/riscv/x-thead-mempair-fail.l
index 32d98f475017e913f393e1efcf0feb58b193fbd2..be396555904723fa237108716ac2c9b3a581349d 100644 (file)
--- a/gas/testsuite/gas/riscv/x-thead-mempair-fail.l
+++ b/gas/testsuite/gas/riscv/x-thead-mempair-fail.l
@@ -5,23 +5,23 @@
 .*: Error: illegal operands `th.sdd a0,a1,\(a2\),3'
 .*: Error: illegal operands `th.swd a0,a1,\(a2\),0'
 
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
 .*: Error: unexpected literal \(3\)
 
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
 .*: Error: unexpected literal \(4\)
 
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
 .*: Error: unexpected literal \(4\)
 
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
 .*: Error: unexpected literal \(3\)
 
-.*: Error: improper immediate value \(18446744073709551615\)
+.*: Error: improper immediate value \(-?\d+\)
 .*: Error: improper immediate value \(4\)
 .*: Error: unexpected literal \(4\)