[PATCH v2 2/5] RISC-V: Refine testcase.

[Kito Cheng]

 - This patch make following patches more simpler.

gas/ChangeLog

	* testsuite/gas/riscv/insn.d: Using regular expression to match
	address.
---
 gas/testsuite/gas/riscv/insn.d | 86 +++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/gas/testsuite/gas/riscv/insn.d b/gas/testsuite/gas/riscv/insn.d
index a1474c91e1..1e9ba3ac3c 100644
--- a/gas/testsuite/gas/riscv/insn.d
+++ b/gas/testsuite/gas/riscv/insn.d
@@ -7,46 +7,46 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+0:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
-[ 	]+4:[ 	]+00d58513[ 	]+addi[ 	]+a0,a1,13
-[ 	]+8:[ 	]+00a58567[ 	]+jalr[ 	]+a0,10\(a1\)
-[ 	]+c:[ 	]+00458503[ 	]+lb[ 	]+a0,4\(a1\)
-[ 	]+10:[ 	]+feb508e3[ 	]+beq[ 	]+a0,a1,0 \<target\>
-[	]+10: R_RISCV_BRANCH[	]+target
-[ 	]+14:[ 	]+00a58223[ 	]+sb[ 	]+a0,4\(a1\)
-[ 	]+18:[ 	]+00fff537[ 	]+lui[ 	]+a0,0xfff
-[ 	]+1c:[ 	]+fe5ff56f[ 	]+jal[ 	]+a0,0 \<target\>
-[	]+1c: R_RISCV_JAL[	]+target
-[ 	]+20:[ 	]+0511[ 	]+addi[ 	]+a0,a0,4
-[ 	]+22:[ 	]+852e[ 	]+mv[ 	]+a0,a1
-[ 	]+24:[ 	]+002c[ 	]+addi[ 	]+a1,sp,8
-[ 	]+26:[ 	]+dde9[ 	]+beqz[ 	]+a1,0 \<target\>
-[	]+26: R_RISCV_RVC_BRANCH[	]+target
-[ 	]+28:[ 	]+bfe1[ 	]+j[ 	]+0 \<target\>
-[	]+28: R_RISCV_RVC_JUMP[	]+target
-[ 	]+2a:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
-[ 	]+2e:[ 	]+00d58513[ 	]+addi[ 	]+a0,a1,13
-[ 	]+32:[ 	]+00a58567[ 	]+jalr[ 	]+a0,10\(a1\)
-[ 	]+36:[ 	]+00458503[ 	]+lb[ 	]+a0,4\(a1\)
-[ 	]+3a:[ 	]+fcb503e3[ 	]+beq[ 	]+a0,a1,0 \<target\>
-[	]+3a: R_RISCV_BRANCH[	]+target
-[ 	]+3e:[ 	]+00a58223[ 	]+sb[ 	]+a0,4\(a1\)
-[ 	]+42:[ 	]+00fff537[ 	]+lui[ 	]+a0,0xfff
-[ 	]+46:[ 	]+fbbff56f[ 	]+jal[ 	]+a0,0 \<target\>
-[	]+46: R_RISCV_JAL[	]+target
-[ 	]+4a:[ 	]+0511[ 	]+addi[ 	]+a0,a0,4
-[ 	]+4c:[ 	]+852e[ 	]+mv[ 	]+a0,a1
-[ 	]+4e:[ 	]+002c[ 	]+addi[ 	]+a1,sp,8
-[ 	]+50:[ 	]+8d6d[ 	]+and[ 	]+a0,a0,a1
-[ 	]+52:[ 	]+d5dd[ 	]+beqz[ 	]+a1,0 \<target\>
-[	]+52: R_RISCV_RVC_BRANCH[	]+target
-[ 	]+54:[ 	]+b775[ 	]+j[ 	]+0 \<target\>
-[	]+54: R_RISCV_RVC_JUMP[	]+target
-[ 	]+56:[ 	]+68c58543[ 	]+fmadd.s[ 	]+fa0,fa1,fa2,fa3,rne
-[ 	]+5a:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
-[ 	]+5e:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
-[ 	]+62:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
-[ 	]+66:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
-[ 	]+6a:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
-[ 	]+6e:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
-[ 	]+72:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
+[^:]+:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
+[^:]+:[ 	]+00d58513[ 	]+addi[ 	]+a0,a1,13
+[^:]+:[ 	]+00a58567[ 	]+jalr[ 	]+a0,10\(a1\)
+[^:]+:[ 	]+00458503[ 	]+lb[ 	]+a0,4\(a1\)
+[^:]+:[ 	]+feb508e3[ 	]+beq[ 	]+a0,a1,0 \<target\>
+[^:]+: R_RISCV_BRANCH[	]+target
+[^:]+:[ 	]+00a58223[ 	]+sb[ 	]+a0,4\(a1\)
+[^:]+:[ 	]+00fff537[ 	]+lui[ 	]+a0,0xfff
+[^:]+:[ 	]+fe5ff56f[ 	]+jal[ 	]+a0,0 \<target\>
+[^:]+: R_RISCV_JAL[	]+target
+[^:]+:[ 	]+0511[ 	]+addi[ 	]+a0,a0,4
+[^:]+:[ 	]+852e[ 	]+mv[ 	]+a0,a1
+[^:]+:[ 	]+002c[ 	]+addi[ 	]+a1,sp,8
+[^:]+:[ 	]+dde9[ 	]+beqz[ 	]+a1,0 \<target\>
+[^:]+: R_RISCV_RVC_BRANCH[	]+target
+[^:]+:[ 	]+bfe1[ 	]+j[ 	]+0 \<target\>
+[^:]+: R_RISCV_RVC_JUMP[	]+target
+[^:]+:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
+[^:]+:[ 	]+00d58513[ 	]+addi[ 	]+a0,a1,13
+[^:]+:[ 	]+00a58567[ 	]+jalr[ 	]+a0,10\(a1\)
+[^:]+:[ 	]+00458503[ 	]+lb[ 	]+a0,4\(a1\)
+[^:]+:[ 	]+fcb503e3[ 	]+beq[ 	]+a0,a1,0 \<target\>
+[^:]+: R_RISCV_BRANCH[	]+target
+[^:]+:[ 	]+00a58223[ 	]+sb[ 	]+a0,4\(a1\)
+[^:]+:[ 	]+00fff537[ 	]+lui[ 	]+a0,0xfff
+[^:]+:[ 	]+fbbff56f[ 	]+jal[ 	]+a0,0 \<target\>
+[^:]+: R_RISCV_JAL[	]+target
+[^:]+:[ 	]+0511[ 	]+addi[ 	]+a0,a0,4
+[^:]+:[ 	]+852e[ 	]+mv[ 	]+a0,a1
+[^:]+:[ 	]+002c[ 	]+addi[ 	]+a1,sp,8
+[^:]+:[ 	]+8d6d[ 	]+and[ 	]+a0,a0,a1
+[^:]+:[ 	]+d5dd[ 	]+beqz[ 	]+a1,0 \<target\>
+[^:]+: R_RISCV_RVC_BRANCH[	]+target
+[^:]+:[ 	]+b775[ 	]+j[ 	]+0 \<target\>
+[^:]+: R_RISCV_RVC_JUMP[	]+target
+[^:]+:[ 	]+68c58543[ 	]+fmadd.s[ 	]+fa0,fa1,fa2,fa3,rne
+[^:]+:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
+[^:]+:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
+[^:]+:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
+[^:]+:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
+[^:]+:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
+[^:]+:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
+[^:]+:[ 	]+00c58533[ 	]+add[ 	]+a0,a1,a2
-- 
2.17.1