Mark MSA as requiring FP64

gas/
	* config/tc-mips.c (FP64_ASES): Add ASE_MSA.
	(mips_after_parse_args): Do not select ASE_MSA without -mfp64.

gas/testsuite/

	* gas/mips/micromips@msa-branch.d: Rework expected output for fp64.
	* gas/mips/msa-branch.d: Likewise.

5 files changed, 114 insertions, 124 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0616ad5..130b287 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-20  Matthew Fortune  <matthew.fortune@imgtec.com>
+
+	* config/tc-mips.c (FP64_ASES): Add ASE_MSA.
+	(mips_after_parse_args): Do not select ASE_MSA without -mfp64.
+
 2014-05-20  Mike Stump  <mikestump@comcast.net>
 
 	* messages.c (as_warn_internal): Ensure we don't interleave output
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 95ffe50..dbf9c6e 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -1643,7 +1643,7 @@ static const struct mips_ase mips_ases[] = {
 };
 
 /* The set of ASEs that require -mfp64.  */
-#define FP64_ASES (ASE_MIPS3D | ASE_MDMX)
+#define FP64_ASES (ASE_MIPS3D | ASE_MDMX | ASE_MSA)
 
 /* Groups of ASE_* flags that represent different revisions of an ASE.  */
 static const unsigned int mips_ase_groups[] = {
@@ -14021,7 +14021,7 @@ mips_after_parse_args (void)
 	file_mips_opts.fp = 64;
       else if ((mips_opts.ase & FP64_ASES)
 	       && ISA_HAS_64BIT_FPRS (mips_opts.isa))
-	/* -mips3d and -mdmx imply 64-bit float registers, if possible.  */
+	/* Handle ASEs that require 64-bit float registers, if possible.  */
 	file_mips_opts.fp = 64;
       else
 	/* 32-bit float registers.  */
@@ -14063,10 +14063,10 @@ mips_after_parse_args (void)
     mips_opts.micromips = (CPU_HAS_MICROMIPS (file_mips_opts.arch))
 			   ? 1 : 0;
 
-  /* MIPS3D and MDMX require 64-bit FPRs, so -mfp32 should stop those
+  /* MIPS3D, MDMX and MSA require 64-bit FPRs, so -mfp32 should stop those
      ASEs from being selected implicitly.  */
   if (file_mips_opts.fp != 64)
-    file_ase_explicit |= ASE_MIPS3D | ASE_MDMX;
+    file_ase_explicit |= ASE_MIPS3D | ASE_MDMX | ASE_MSA;
 
   /* If the user didn't explicitly select or deselect a particular ASE,
      use the default setting for the CPU.  */
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index a9c1a8a..007b167 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-20  Matthew Fortune  <matthew.fortune@imgtec.com>
+
+	* gas/mips/micromips@msa-branch.d: Rework expected output for fp64.
+	* gas/mips/msa-branch.d: Likewise.
+
 2014-05-20  Nick Clifton  <nickc@redhat.com>
 
 	* gas/elf/struct.d: Expect extra output from some toolchains.
diff --git a/gas/testsuite/gas/mips/micromips@msa-branch.d b/gas/testsuite/gas/mips/micromips@msa-branch.d
index 6c8fdb7..8b22b9e 100644
--- a/gas/testsuite/gas/mips/micromips@msa-branch.d
+++ b/gas/testsuite/gas/mips/micromips@msa-branch.d
@@ -30,10 +30,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 8300 fffe 	bz\.b	\$w0,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 8301 fffe 	bz\.b	\$w1,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
-[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 8302 fffe 	bz\.b	\$w2,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
@@ -61,10 +60,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 8320 fffe 	bz\.h	\$w0,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 8321 fffe 	bz\.h	\$w1,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
-[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 8322 fffe 	bz\.h	\$w2,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
@@ -92,10 +90,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 8340 fffe 	bz\.w	\$w0,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 8341 fffe 	bz\.w	\$w1,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
-[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 8342 fffe 	bz\.w	\$w2,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
@@ -123,10 +120,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 8360 fffe 	bz\.d	\$w0,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 8361 fffe 	bz\.d	\$w1,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
-[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 8362 fffe 	bz\.d	\$w2,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
@@ -154,10 +150,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 8160 fffe 	bz\.v	\$w0,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 8161 fffe 	bz\.v	\$w1,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
-[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 8162 fffe 	bz\.v	\$w2,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
@@ -185,10 +180,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 8380 fffe 	bnz\.b	\$w0,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 8381 fffe 	bnz\.b	\$w1,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
-[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 8382 fffe 	bnz\.b	\$w2,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
@@ -216,10 +210,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 83a0 fffe 	bnz\.h	\$w0,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 83a1 fffe 	bnz\.h	\$w1,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
-[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 83a2 fffe 	bnz\.h	\$w2,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
@@ -247,10 +240,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 83c0 fffe 	bnz\.w	\$w0,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 83c1 fffe 	bnz\.w	\$w1,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
-[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 83c2 fffe 	bnz\.w	\$w2,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
@@ -278,10 +270,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 83e0 fffe 	bnz\.d	\$w0,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 83e1 fffe 	bnz\.d	\$w1,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
-[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 83e2 fffe 	bnz\.d	\$w2,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
@@ -309,10 +300,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 81e0 fffe 	bnz\.v	\$w0,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 81e1 fffe 	bnz\.v	\$w1,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
-[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 81e2 fffe 	bnz\.v	\$w2,[0-9a-f]+ <[^>]*>
 [	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	test
 [0-9a-f]+ <[^>]*> 5482 0130 	add\.d	\$f0,\$f2,\$f4
diff --git a/gas/testsuite/gas/mips/msa-branch.d b/gas/testsuite/gas/mips/msa-branch.d
index 567a2a4..fbab5cc 100644
--- a/gas/testsuite/gas/mips/msa-branch.d
+++ b/gas/testsuite/gas/mips/msa-branch.d
@@ -6,223 +6,213 @@
 
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 4700fffe 	bz\.b	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4700.... 	bz\.b	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4701fffc 	bz\.b	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4701.... 	bz\.b	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 4702fffa 	bz\.b	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4702.... 	bz\.b	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 4700fff7 	bz\.b	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4700.... 	bz\.b	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4701fff5 	bz\.b	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4701.... 	bz\.b	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 4702fff3 	bz\.b	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4702.... 	bz\.b	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 4700fff0 	bz\.b	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4700.... 	bz\.b	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 4701.... 	bz\.b	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 4701ffed 	bz\.b	\$w1,[0-9a-f]+ <test>
-[0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4702ffeb 	bz\.b	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4702.... 	bz\.b	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 4720ffe8 	bz\.h	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4720.... 	bz\.h	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4721ffe6 	bz\.h	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4721.... 	bz\.h	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 4722ffe4 	bz\.h	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4722.... 	bz\.h	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 4720ffe1 	bz\.h	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4720.... 	bz\.h	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4721ffdf 	bz\.h	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4721.... 	bz\.h	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 4722ffdd 	bz\.h	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4722.... 	bz\.h	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 4720ffda 	bz\.h	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4720.... 	bz\.h	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 4721.... 	bz\.h	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 4721ffd7 	bz\.h	\$w1,[0-9a-f]+ <test>
-[0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4722ffd5 	bz\.h	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4722.... 	bz\.h	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 4740ffd2 	bz\.w	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4740.... 	bz\.w	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4741ffd0 	bz\.w	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4741.... 	bz\.w	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 4742ffce 	bz\.w	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4742.... 	bz\.w	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 4740ffcb 	bz\.w	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4740.... 	bz\.w	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4741ffc9 	bz\.w	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4741.... 	bz\.w	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 4742ffc7 	bz\.w	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4742.... 	bz\.w	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 4740ffc4 	bz\.w	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4740.... 	bz\.w	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 4741.... 	bz\.w	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 4741ffc1 	bz\.w	\$w1,[0-9a-f]+ <test>
-[0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4742ffbf 	bz\.w	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4742.... 	bz\.w	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 4760ffbc 	bz\.d	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4760.... 	bz\.d	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4761ffba 	bz\.d	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4761.... 	bz\.d	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 4762ffb8 	bz\.d	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4762.... 	bz\.d	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 4760ffb5 	bz\.d	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4760.... 	bz\.d	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4761ffb3 	bz\.d	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4761.... 	bz\.d	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 4762ffb1 	bz\.d	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4762.... 	bz\.d	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 4760ffae 	bz\.d	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4760.... 	bz\.d	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 4761.... 	bz\.d	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 4761ffab 	bz\.d	\$w1,[0-9a-f]+ <test>
-[0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4762ffa9 	bz\.d	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4762.... 	bz\.d	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 4560ffa6 	bz\.v	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4560.... 	bz\.v	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4561ffa4 	bz\.v	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4561.... 	bz\.v	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 4562ffa2 	bz\.v	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4562.... 	bz\.v	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 4560ff9f 	bz\.v	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4560.... 	bz\.v	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4561ff9d 	bz\.v	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4561.... 	bz\.v	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 4562ff9b 	bz\.v	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4562.... 	bz\.v	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 4560ff98 	bz\.v	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4560.... 	bz\.v	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 4561.... 	bz\.v	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 4561ff95 	bz\.v	\$w1,[0-9a-f]+ <test>
-[0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4562ff93 	bz\.v	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4562.... 	bz\.v	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 4780ff90 	bnz\.b	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4780.... 	bnz\.b	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4781ff8e 	bnz\.b	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4781.... 	bnz\.b	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 4782ff8c 	bnz\.b	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4782.... 	bnz\.b	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 4780ff89 	bnz\.b	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4780.... 	bnz\.b	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4781ff87 	bnz\.b	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4781.... 	bnz\.b	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 4782ff85 	bnz\.b	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4782.... 	bnz\.b	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 4780ff82 	bnz\.b	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4780.... 	bnz\.b	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 4781.... 	bnz\.b	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 4781ff7f 	bnz\.b	\$w1,[0-9a-f]+ <test>
-[0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 4782ff7d 	bnz\.b	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 4782.... 	bnz\.b	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 47a0ff7a 	bnz\.h	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47a0.... 	bnz\.h	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 47a1ff78 	bnz\.h	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47a1.... 	bnz\.h	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 47a2ff76 	bnz\.h	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47a2.... 	bnz\.h	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 47a0ff73 	bnz\.h	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47a0.... 	bnz\.h	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 47a1ff71 	bnz\.h	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47a1.... 	bnz\.h	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 47a2ff6f 	bnz\.h	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47a2.... 	bnz\.h	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 47a0ff6c 	bnz\.h	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47a0.... 	bnz\.h	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 47a1.... 	bnz\.h	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 47a1ff69 	bnz\.h	\$w1,[0-9a-f]+ <test>
-[0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 47a2ff67 	bnz\.h	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47a2.... 	bnz\.h	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 47c0ff64 	bnz\.w	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47c0.... 	bnz\.w	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 47c1ff62 	bnz\.w	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47c1.... 	bnz\.w	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 47c2ff60 	bnz\.w	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47c2.... 	bnz\.w	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 47c0ff5d 	bnz\.w	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47c0.... 	bnz\.w	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 47c1ff5b 	bnz\.w	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47c1.... 	bnz\.w	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 47c2ff59 	bnz\.w	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47c2.... 	bnz\.w	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 47c0ff56 	bnz\.w	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47c0.... 	bnz\.w	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 47c1.... 	bnz\.w	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 47c1ff53 	bnz\.w	\$w1,[0-9a-f]+ <test>
-[0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 47c2ff51 	bnz\.w	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47c2.... 	bnz\.w	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 47e0ff4e 	bnz\.d	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47e0.... 	bnz\.d	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 47e1ff4c 	bnz\.d	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47e1.... 	bnz\.d	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 47e2ff4a 	bnz\.d	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47e2.... 	bnz\.d	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 47e0ff47 	bnz\.d	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47e0.... 	bnz\.d	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 47e1ff45 	bnz\.d	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47e1.... 	bnz\.d	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 47e2ff43 	bnz\.d	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47e2.... 	bnz\.d	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 47e0ff40 	bnz\.d	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47e0.... 	bnz\.d	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 47e1.... 	bnz\.d	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 47e1ff3d 	bnz\.d	\$w1,[0-9a-f]+ <test>
-[0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 47e2ff3b 	bnz\.d	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 47e2.... 	bnz\.d	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 45e0ff38 	bnz\.v	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 45e0.... 	bnz\.v	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 45e1ff36 	bnz\.v	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 45e1.... 	bnz\.v	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
-[0-9a-f]+ <[^>]*> 45e2ff34 	bnz\.v	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 45e2.... 	bnz\.v	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 7aa2081c 	fsune\.d	\$w0,\$w1,\$w2
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 45e0ff31 	bnz\.v	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 45e0.... 	bnz\.v	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 45e1ff2f 	bnz\.v	\$w1,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 45e1.... 	bnz\.v	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
-[0-9a-f]+ <[^>]*> 45e2ff2d 	bnz\.v	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 45e2.... 	bnz\.v	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46020800 	add\.s	\$f0,\$f1,\$f2
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 45e0ff2a 	bnz\.v	\$w0,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 45e0.... 	bnz\.v	\$w0,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 45e1.... 	bnz\.v	\$w1,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
-[0-9a-f]+ <[^>]*> 45e1ff27 	bnz\.v	\$w1,[0-9a-f]+ <test>
-[0-9a-f]+ <[^>]*> 00000000 	nop
-[0-9a-f]+ <[^>]*> 45e2ff25 	bnz\.v	\$w2,[0-9a-f]+ <test>
+[0-9a-f]+ <[^>]*> 45e2.... 	bnz\.v	\$w2,[0-9a-f]+ <test>
 [0-9a-f]+ <[^>]*> 46241000 	add\.d	\$f0,\$f2,\$f4
 	\.\.\.