2004-12-21 Tomer Levi <Tomer.Levi@nsc.com>

	* gas/crx/beq_insn.d: Update reference file according to disassembler printing method.
	* gas/crx/bit_insn.d: Likewise.
	* gas/crx/br_insn.d: Likewise.
	* gas/crx/cmpbr_insn.d: Likewise.
	* gas/crx/cop_insn.d: Likewise.
	* gas/crx/load_stor_insn.d: Likewise.

6 files changed, 232 insertions, 232 deletions

diff --git a/gas/testsuite/gas/crx/beq_insn.d b/gas/testsuite/gas/crx/beq_insn.d
index 6ceaa9e..dc4ebc8 100644
--- a/gas/testsuite/gas/crx/beq_insn.d
+++ b/gas/testsuite/gas/crx/beq_insn.d
@@ -7,19 +7,19 @@
 Disassembly of section .text:
 
 00000000 <beq0b>:
-   0:	aa b0       	beq0b	r10, 0x16
+   0:	aa b0       	beq0b	r10, 0x16 [-_<>+0-9a-z]*
 
 00000002 <bne0b>:
-   2:	fb b1       	bne0b	r11, 0x20
+   2:	fb b1       	bne0b	r11, 0x20 [-_<>+0-9a-z]*
 
 00000004 <beq0w>:
-   4:	0c b2       	beq0w	r12, 0x2
+   4:	0c b2       	beq0w	r12, 0x2 [-_<>+0-9a-z]*
 
 00000006 <bne0w>:
-   6:	fd b3       	bne0w	r13, 0x20
+   6:	fd b3       	bne0w	r13, 0x20 [-_<>+0-9a-z]*
 
 00000008 <beq0d>:
-   8:	fe b4       	beq0d	r14, 0x20
+   8:	fe b4       	beq0d	r14, 0x20 [-_<>+0-9a-z]*
 
 0000000a <bne0d>:
-   a:	7f b5       	bne0d	r15, 0x10
+   a:	7f b5       	bne0d	r15, 0x10 [-_<>+0-9a-z]*
diff --git a/gas/testsuite/gas/crx/bit_insn.d b/gas/testsuite/gas/crx/bit_insn.d
index 1f92dc5..6f75a82 100644
--- a/gas/testsuite/gas/crx/bit_insn.d
+++ b/gas/testsuite/gas/crx/bit_insn.d
@@ -7,10 +7,10 @@
 Disassembly of section .text:
 
 00000000 <cbitb>:
-   0:	06 39 00 00 	cbitb	\$0x6, 0x450
+   0:	06 39 00 00 	cbitb	\$0x6, 0x450 [-_<>+0-9a-z]*
    4:	50 04 
-   6:	06 38 50 04 	cbitb	\$0x6, 0xffff0450
-   a:	07 39 04 00 	cbitb	\$0x7, 0x41287
+   6:	06 38 50 04 	cbitb	\$0x6, 0xffff0450 [-_<>+0-9a-z]*
+   a:	07 39 04 00 	cbitb	\$0x7, 0x41287 [-_<>+0-9a-z]*
    e:	87 12 
   10:	03 3a 09 50 	cbitb	\$0x3, 0x9\(r5\)
   14:	0f fe       	cbitb	\$0x0, \(r15\)
@@ -22,10 +22,10 @@ Disassembly of section .text:
   26:	b3 fe 
 
 00000028 <cbitw>:
-  28:	2f 39 00 00 	cbitw	\$0xf, 0x23
+  28:	2f 39 00 00 	cbitw	\$0xf, 0x23 [-_<>+0-9a-z]*
   2c:	23 00 
-  2e:	26 38 23 00 	cbitw	\$0x6, 0xffff0023
-  32:	21 39 0f 00 	cbitw	\$0x1, 0xff287
+  2e:	26 38 23 00 	cbitw	\$0x6, 0xffff0023 [-_<>+0-9a-z]*
+  32:	21 39 0f 00 	cbitw	\$0x1, 0xff287 [-_<>+0-9a-z]*
   36:	87 f2 
   38:	2f 3a 01 50 	cbitw	\$0xf, 0x1\(r5\)
   3c:	0e bd       	cbitw	\$0x0, \(r14\)
@@ -37,10 +37,10 @@ Disassembly of section .text:
   4e:	38 ff 
 
 00000050 <cbitd>:
-  50:	66 39 00 00 	cbitd	\$0x6, 0xff
+  50:	66 39 00 00 	cbitd	\$0x6, 0xff [-_<>+0-9a-z]*
   54:	ff 00 
-  56:	66 38 ff 0f 	cbitd	\$0x6, 0xffff0fff
-  5a:	7a 39 01 00 	cbitd	\$0x1a, 0x10000
+  56:	66 38 ff 0f 	cbitd	\$0x6, 0xffff0fff [-_<>+0-9a-z]*
+  5a:	7a 39 01 00 	cbitd	\$0x1a, 0x10000 [-_<>+0-9a-z]*
   5e:	00 00 
   60:	7f 3a 07 90 	cbitd	\$0x1f, 0x7\(r9\)
   64:	02 f7       	cbitd	\$0x10, \(r2\)
@@ -53,10 +53,10 @@ Disassembly of section .text:
   7a:	08 30 e4 f7 	cbitd	\$0x1e, r4
 
 0000007e <sbitb>:
-  7e:	0e 39 00 00 	sbitb	\$0x6, 0x450
+  7e:	0e 39 00 00 	sbitb	\$0x6, 0x450 [-_<>+0-9a-z]*
   82:	50 04 
-  84:	0e 38 50 04 	sbitb	\$0x6, 0xffff0450
-  88:	0f 39 04 00 	sbitb	\$0x7, 0x41287
+  84:	0e 38 50 04 	sbitb	\$0x6, 0xffff0450 [-_<>+0-9a-z]*
+  88:	0f 39 04 00 	sbitb	\$0x7, 0x41287 [-_<>+0-9a-z]*
   8c:	87 12 
   8e:	0b 3a 09 50 	sbitb	\$0x3, 0x9\(r5\)
   92:	8f fe       	sbitb	\$0x0, \(r15\)
@@ -68,10 +68,10 @@ Disassembly of section .text:
   a4:	b3 fe 
 
 000000a6 <sbitw>:
-  a6:	3f 39 00 00 	sbitw	\$0xf, 0x23
+  a6:	3f 39 00 00 	sbitw	\$0xf, 0x23 [-_<>+0-9a-z]*
   aa:	23 00 
-  ac:	36 38 23 00 	sbitw	\$0x6, 0xffff0023
-  b0:	31 39 0f 00 	sbitw	\$0x1, 0xff287
+  ac:	36 38 23 00 	sbitw	\$0x6, 0xffff0023 [-_<>+0-9a-z]*
+  b0:	31 39 0f 00 	sbitw	\$0x1, 0xff287 [-_<>+0-9a-z]*
   b4:	87 f2 
   b6:	3f 3a 01 50 	sbitw	\$0xf, 0x1\(r5\)
   ba:	0e be       	sbitw	\$0x0, \(r14\)
@@ -83,10 +83,10 @@ Disassembly of section .text:
   cc:	38 ff 
 
 000000ce <sbitd>:
-  ce:	86 39 00 00 	sbitd	\$0x6, 0xff
+  ce:	86 39 00 00 	sbitd	\$0x6, 0xff [-_<>+0-9a-z]*
   d2:	ff 00 
-  d4:	86 38 ff 0f 	sbitd	\$0x6, 0xffff0fff
-  d8:	9a 39 01 00 	sbitd	\$0x1a, 0x10000
+  d4:	86 38 ff 0f 	sbitd	\$0x6, 0xffff0fff [-_<>+0-9a-z]*
+  d8:	9a 39 01 00 	sbitd	\$0x1a, 0x10000 [-_<>+0-9a-z]*
   dc:	00 00 
   de:	9f 3a 07 90 	sbitd	\$0x1f, 0x7\(r9\)
   e2:	02 f9       	sbitd	\$0x10, \(r2\)
@@ -99,10 +99,10 @@ Disassembly of section .text:
   f8:	08 30 e4 f9 	sbitd	\$0x1e, r4
 
 000000fc <tbitb>:
-  fc:	16 39 00 00 	tbitb	\$0x6, 0x450
+  fc:	16 39 00 00 	tbitb	\$0x6, 0x450 [-_<>+0-9a-z]*
  100:	50 04 
- 102:	16 38 50 04 	tbitb	\$0x6, 0xffff0450
- 106:	17 39 04 00 	tbitb	\$0x7, 0x41287
+ 102:	16 38 50 04 	tbitb	\$0x6, 0xffff0450 [-_<>+0-9a-z]*
+ 106:	17 39 04 00 	tbitb	\$0x7, 0x41287 [-_<>+0-9a-z]*
  10a:	87 12 
  10c:	13 3a 09 50 	tbitb	\$0x3, 0x9\(r5\)
  110:	0f ff       	tbitb	\$0x0, \(r15\)
@@ -114,10 +114,10 @@ Disassembly of section .text:
  122:	b3 fe 
 
 00000124 <tbitw>:
- 124:	4f 39 00 00 	tbitw	\$0xf, 0x23
+ 124:	4f 39 00 00 	tbitw	\$0xf, 0x23 [-_<>+0-9a-z]*
  128:	23 00 
- 12a:	46 38 23 00 	tbitw	\$0x6, 0xffff0023
- 12e:	41 39 0f 00 	tbitw	\$0x1, 0xff287
+ 12a:	46 38 23 00 	tbitw	\$0x6, 0xffff0023 [-_<>+0-9a-z]*
+ 12e:	41 39 0f 00 	tbitw	\$0x1, 0xff287 [-_<>+0-9a-z]*
  132:	87 f2 
  134:	4f 3a 01 50 	tbitw	\$0xf, 0x1\(r5\)
  138:	0e bf       	tbitw	\$0x0, \(r14\)
@@ -129,10 +129,10 @@ Disassembly of section .text:
  14a:	38 ff 
 
 0000014c <tbitd>:
- 14c:	a6 39 00 00 	tbitd	\$0x6, 0xff
+ 14c:	a6 39 00 00 	tbitd	\$0x6, 0xff [-_<>+0-9a-z]*
  150:	ff 00 
- 152:	a6 38 ff 0f 	tbitd	\$0x6, 0xffff0fff
- 156:	ba 39 01 00 	tbitd	\$0x1a, 0x10000
+ 152:	a6 38 ff 0f 	tbitd	\$0x6, 0xffff0fff [-_<>+0-9a-z]*
+ 156:	ba 39 01 00 	tbitd	\$0x1a, 0x10000 [-_<>+0-9a-z]*
  15a:	00 00 
  15c:	bf 3a 07 90 	tbitd	\$0x1f, 0x7\(r9\)
  160:	02 fb       	tbitd	\$0x10, \(r2\)
diff --git a/gas/testsuite/gas/crx/br_insn.d b/gas/testsuite/gas/crx/br_insn.d
index 1aaeb7b..e792299 100644
--- a/gas/testsuite/gas/crx/br_insn.d
+++ b/gas/testsuite/gas/crx/br_insn.d
@@ -7,112 +7,112 @@
 Disassembly of section .text:
 
 00000000 <beq>:
-   0:	08 70       	beq	\*\+0x10
-   2:	7e 70 fd 07 	beq	\*\+0xffa
-   6:	7f 70 04 00 	beq	\*\+0x8aa52
+   0:	08 70       	beq	0x[0-9a-f]* [-_<>+0-9a-z]*
+   2:	7e 70 fd 07 	beq	0x[0-9a-f]* [-_<>+0-9a-z]*
+   6:	7f 70 04 00 	beq	0x[0-9a-f]* [-_<>+0-9a-z]*
    a:	29 55 
 
 0000000c <bne>:
-   c:	fc 71       	bne	\*\-0x8
-   e:	7e 71 a3 07 	bne	\*\+0xf46
-  12:	7f 71 f8 ff 	bne	\*\-0xf7812
+   c:	fc 71       	bne	0x[0-9a-f]* [-_<>+0-9a-z]*
+   e:	7e 71 a3 07 	bne	0x[0-9a-f]* [-_<>+0-9a-z]*
+  12:	7f 71 f8 ff 	bne	0x[0-9a-f]* [-_<>+0-9a-z]*
   16:	f7 43 
 
 00000018 <bcs>:
-  18:	7d 72       	bcs	\*\+0xfa
-  1a:	7e 72 c6 ec 	bcs	\*\-0x2674
-  1e:	7f 72 04 00 	bcs	\*\+0x89052
+  18:	7d 72       	bcs	0x[0-9a-f]* [-_<>+0-9a-z]*
+  1a:	7e 72 c6 ec 	bcs	0x[0-9a-f]* [-_<>+0-9a-z]*
+  1e:	7f 72 04 00 	bcs	0x[0-9a-f]* [-_<>+0-9a-z]*
   22:	29 48 
 
 00000024 <bcc>:
-  24:	83 73       	bcc	\*\-0xfa
-  26:	7e 73 ff 7f 	bcc	\*\+0xfffe
-  2a:	ff 73       	bcc	\*\-0x2
+  24:	83 73       	bcc	0x[0-9a-f]* [-_<>+0-9a-z]*
+  26:	7e 73 ff 7f 	bcc	0x[0-9a-f]* [-_<>+0-9a-z]*
+  2a:	ff 73       	bcc	0x[0-9a-f]* [-_<>+0-9a-z]*
 
 0000002c <bhi>:
-  2c:	7e 74 7f 00 	bhi	\*\+0xfe
-  30:	7e 74 01 80 	bhi	\*\-0xfffe
-  34:	01 74       	bhi	\*\+0x2
+  2c:	7e 74 7f 00 	bhi	0x[0-9a-f]* [-_<>+0-9a-z]*
+  30:	7e 74 01 80 	bhi	0x[0-9a-f]* [-_<>+0-9a-z]*
+  34:	01 74       	bhi	0x[0-9a-f]* [-_<>+0-9a-z]*
 
 00000036 <bls>:
-  36:	ff 75       	bls	\*\-0x2
-  38:	7e 75 00 80 	bls	\*\-0x0
-  3c:	7f 75 00 00 	bls	\*\+0x10000
+  36:	ff 75       	bls	0x[0-9a-f]* [-_<>+0-9a-z]*
+  38:	7e 75 00 80 	bls	0x[0-9a-f]* [-_<>+0-9a-z]*
+  3c:	7f 75 00 00 	bls	0x[0-9a-f]* [-_<>+0-9a-z]*
   40:	00 80 
 
 00000042 <bgt>:
-  42:	18 76       	bgt	\*\+0x30
-  44:	7e 76 ff 07 	bgt	\*\+0xffe
-  48:	7f 76 ff ff 	bgt	\*\-0x10002
+  42:	18 76       	bgt	0x[0-9a-f]* [-_<>+0-9a-z]*
+  44:	7e 76 ff 07 	bgt	0x[0-9a-f]* [-_<>+0-9a-z]*
+  48:	7f 76 ff ff 	bgt	0x[0-9a-f]* [-_<>+0-9a-z]*
   4c:	ff 7f 
 
 0000004e <ble>:
-  4e:	e0 77       	ble	\*\-0x40
-  50:	7e 77 7f ff 	ble	\*\-0x102
-  54:	7f 77 07 00 	ble	\*\+0xefff2
+  4e:	e0 77       	ble	0x[0-9a-f]* [-_<>+0-9a-z]*
+  50:	7e 77 7f ff 	ble	0x[0-9a-f]* [-_<>+0-9a-z]*
+  54:	7f 77 07 00 	ble	0x[0-9a-f]* [-_<>+0-9a-z]*
   58:	f9 7f 
 
 0000005a <bfs>:
-  5a:	01 78       	bfs	\*\+0x2
-  5c:	7e 78 ff 7f 	bfs	\*\+0xfffe
-  60:	7f 78 00 00 	bfs	\*\+0x10000
+  5a:	01 78       	bfs	0x[0-9a-f]* [-_<>+0-9a-z]*
+  5c:	7e 78 ff 7f 	bfs	0x[0-9a-f]* [-_<>+0-9a-z]*
+  60:	7f 78 00 00 	bfs	0x[0-9a-f]* [-_<>+0-9a-z]*
   64:	00 80 
 
 00000066 <bfc>:
-  66:	7e 79 7f 00 	bfc	\*\+0xfe
-  6a:	7e 79 ff 7f 	bfc	\*\+0xfffe
-  6e:	7f 79 04 00 	bfc	\*\+0x80000
+  66:	7e 79 7f 00 	bfc	0x[0-9a-f]* [-_<>+0-9a-z]*
+  6a:	7e 79 ff 7f 	bfc	0x[0-9a-f]* [-_<>+0-9a-z]*
+  6e:	7f 79 04 00 	bfc	0x[0-9a-f]* [-_<>+0-9a-z]*
   72:	00 00 
 
 00000074 <blo>:
-  74:	81 7a       	blo	\*\-0xfe
-  76:	7e 7a 01 80 	blo	\*\-0xfffe
-  7a:	ff 7a       	blo	\*\-0x2
+  74:	81 7a       	blo	0x[0-9a-f]* [-_<>+0-9a-z]*
+  76:	7e 7a 01 80 	blo	0x[0-9a-f]* [-_<>+0-9a-z]*
+  7a:	ff 7a       	blo	0x[0-9a-f]* [-_<>+0-9a-z]*
 
 0000007c <bhs>:
-  7c:	80 7b       	bhs	\*\-0x0
-  7e:	7e 7b 00 88 	bhs	\*\-0xf000
-  82:	7e 7b f9 07 	bhs	\*\+0xff2
+  7c:	80 7b       	bhs	0x[0-9a-f]* [-_<>+0-9a-z]*
+  7e:	7e 7b 00 88 	bhs	0x[0-9a-f]* [-_<>+0-9a-z]*
+  82:	7e 7b f9 07 	bhs	0x[0-9a-f]* [-_<>+0-9a-z]*
 
 00000086 <blt>:
-  86:	11 7c       	blt	\*\+0x22
-  88:	7e 7c 69 02 	blt	\*\+0x4d2
-  8c:	ff 7c       	blt	\*\-0x2
+  86:	11 7c       	blt	0x[0-9a-f]* [-_<>+0-9a-z]*
+  88:	7e 7c 69 02 	blt	0x[0-9a-f]* [-_<>+0-9a-z]*
+  8c:	ff 7c       	blt	0x[0-9a-f]* [-_<>+0-9a-z]*
 
 0000008e <bge>:
-  8e:	1a 7d       	bge	\*\+0x34
-  90:	7e 7d e6 f6 	bge	\*\-0x1234
-  94:	7f 7d 08 00 	bge	\*\+0x100002
+  8e:	1a 7d       	bge	0x[0-9a-f]* [-_<>+0-9a-z]*
+  90:	7e 7d e6 f6 	bge	0x[0-9a-f]* [-_<>+0-9a-z]*
+  94:	7f 7d 08 00 	bge	0x[0-9a-f]* [-_<>+0-9a-z]*
   98:	01 00 
 
 0000009a <br>:
-  9a:	0e 7e       	br	\*\+0x1c
-  9c:	7e 7e 4e 01 	br	\*\+0x29c
-  a0:	7f 7e f7 ff 	br	\*\-0x100002
+  9a:	0e 7e       	br	0x[0-9a-f]* [-_<>+0-9a-z]*
+  9c:	7e 7e 4e 01 	br	0x[0-9a-f]* [-_<>+0-9a-z]*
+  a0:	7f 7e f7 ff 	br	0x[0-9a-f]* [-_<>+0-9a-z]*
   a4:	ff ff 
 
 000000a6 <dbnzb>:
-  a6:	40 30 0e 00 	dbnzb	r0, \*\+0x1c
-  aa:	41 30 97 53 	dbnzb	r1, \*\+0xa72e
+  a6:	40 30 0e 00 	dbnzb	r0, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  aa:	41 30 97 53 	dbnzb	r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
 
 000000ae <dbnzw>:
-  ae:	52 30 cc 0c 	dbnzw	r2, \*\+0x1998
-  b2:	53 31 31 00 	dbnzw	r3, \*\+0x63ffb0
+  ae:	52 30 cc 0c 	dbnzw	r2, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  b2:	53 31 31 00 	dbnzw	r3, 0x[0-9a-f]* [-_<>+0-9a-z]*
   b6:	d8 ff 
 
 000000b8 <dbnzd>:
-  b8:	6e 30 f9 07 	dbnzd	r14, \*\+0xff2
-  bc:	6f 31 97 00 	dbnzd	r15, \*\+0x12ffff4
+  b8:	6e 30 f9 07 	dbnzd	r14, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  bc:	6f 31 97 00 	dbnzd	r15, 0x[0-9a-f]* [-_<>+0-9a-z]*
   c0:	fa ff 
 
 000000c2 <bal>:
-  c2:	71 30 01 00 	bal	r1, \*\+0x2
-  c6:	71 30 ff ff 	bal	r1, \*\-0x2
-  ca:	71 30 e7 55 	bal	r1, \*\+0xabce
-  ce:	70 30 59 fa 	bal	r0, \*\-0xb4e
-  d2:	71 31 05 00 	bal	r1, \*\+0xabcde
+  c2:	71 30 01 00 	bal	r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  c6:	71 30 ff ff 	bal	r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  ca:	71 30 e7 55 	bal	r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  ce:	70 30 59 fa 	bal	r0, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  d2:	71 31 05 00 	bal	r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
   d6:	6f 5e 
-  d8:	71 31 fa ff 	bal	r1, \*\-0xabcde
+  d8:	71 31 fa ff 	bal	r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
   dc:	91 a1 
 
 000000de <jal>:
diff --git a/gas/testsuite/gas/crx/cmpbr_insn.d b/gas/testsuite/gas/crx/cmpbr_insn.d
index d0ff34b..c244f77 100644
--- a/gas/testsuite/gas/crx/cmpbr_insn.d
+++ b/gas/testsuite/gas/crx/cmpbr_insn.d
@@ -7,244 +7,244 @@
 Disassembly of section .text:
 
 00000000 <cmpbeqb>:
-   0:	81 30 2b 20 	cmpbeqb	r1, r2, \*\+0x56
-   4:	83 31 00 40 	cmpbeqb	r3, r4, \*\+0x4348
+   0:	81 30 2b 20 	cmpbeqb	r1, r2, 0x[0-9a-f]* [-_<>+0-9a-z]*
+   4:	83 31 00 40 	cmpbeqb	r3, r4, 0x[0-9a-f]* [-_<>+0-9a-z]*
    8:	a4 21 
-   a:	c0 30 1b 50 	cmpbeqb	\$0x0, r5, \*\+0x36
-   e:	c1 31 1a 60 	cmpbeqb	\$0x1, r6, \*\+0x345678
+   a:	c0 30 1b 50 	cmpbeqb	\$0x0, r5, 0x[0-9a-f]* [-_<>+0-9a-z]*
+   e:	c1 31 1a 60 	cmpbeqb	\$0x1, r6, 0x[0-9a-f]* [-_<>+0-9a-z]*
   12:	3c 2b 
 
 00000014 <cmpbneb>:
-  14:	87 30 7d 81 	cmpbneb	r7, r8, \*\+0xfa
-  18:	89 31 00 a1 	cmpbneb	r9, r10, \*\+0xf000
+  14:	87 30 7d 81 	cmpbneb	r7, r8, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  18:	89 31 00 a1 	cmpbneb	r9, r10, 0x[0-9a-f]* [-_<>+0-9a-z]*
   1c:	00 78 
-  1e:	c2 30 01 b1 	cmpbneb	\$0x2, r11, \*\+0x2
-  22:	c3 31 7f c1 	cmpbneb	\$0x3, r12, \*\+0xfffffe
+  1e:	c2 30 01 b1 	cmpbneb	\$0x2, r11, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  22:	c3 31 7f c1 	cmpbneb	\$0x3, r12, 0x[0-9a-f]* [-_<>+0-9a-z]*
   26:	ff ff 
 
 00000028 <cmpbhib>:
-  28:	8d 31 00 e4 	cmpbhib	r13, r14, \*\+0x100
+  28:	8d 31 00 e4 	cmpbhib	r13, r14, 0x[0-9a-f]* [-_<>+0-9a-z]*
   2c:	80 00 
-  2e:	8f 31 00 e4 	cmpbhib	r15, r14, \*\+0x102
+  2e:	8f 31 00 e4 	cmpbhib	r15, r14, 0x[0-9a-f]* [-_<>+0-9a-z]*
   32:	81 00 
-  34:	c4 30 ff f4 	cmpbhib	\$0x4, r15, \*\-0x2
-  38:	c5 31 ff 14 	cmpbhib	\$0xfffffffc, r1, \*\-0x104
+  34:	c4 30 ff f4 	cmpbhib	\$0x4, r15, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  38:	c5 31 ff 14 	cmpbhib	\$0xfffffffc, r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
   3c:	7e ff 
 
 0000003e <cmpblsb>:
-  3e:	82 30 3c 35 	cmpblsb	r2, r3, \*\+0x78
-  42:	84 31 00 55 	cmpblsb	r4, r5, \*\+0x100
+  3e:	82 30 3c 35 	cmpblsb	r2, r3, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  42:	84 31 00 55 	cmpblsb	r4, r5, 0x[0-9a-f]* [-_<>+0-9a-z]*
   46:	80 00 
-  48:	c6 30 84 65 	cmpblsb	\$0xffffffff, r6, \*\-0xf8
-  4c:	c7 31 ff 75 	cmpblsb	\$0x7, r7, \*\-0x102
+  48:	c6 30 84 65 	cmpblsb	\$0xffffffff, r6, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  4c:	c7 31 ff 75 	cmpblsb	\$0x7, r7, 0x[0-9a-f]* [-_<>+0-9a-z]*
   50:	7f ff 
 
 00000052 <cmpbgtb>:
-  52:	88 30 83 96 	cmpbgtb	r8, r9, \*\-0xfa
-  56:	8a 31 00 b6 	cmpbgtb	r10, r11, \*\+0xfc0
+  52:	88 30 83 96 	cmpbgtb	r8, r9, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  56:	8a 31 00 b6 	cmpbgtb	r10, r11, 0x[0-9a-f]* [-_<>+0-9a-z]*
   5a:	e0 07 
-  5c:	c8 30 7f c6 	cmpbgtb	\$0x8, r12, \*\+0xfe
-  60:	c9 31 7f d6 	cmpbgtb	\$0x10, r13, \*\+0xfffff2
+  5c:	c8 30 7f c6 	cmpbgtb	\$0x8, r12, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  60:	c9 31 7f d6 	cmpbgtb	\$0x10, r13, 0x[0-9a-f]* [-_<>+0-9a-z]*
   64:	f9 ff 
 
 00000066 <cmpbleb>:
-  66:	8e 30 81 f7 	cmpbleb	r14, r15, \*\-0xfe
-  6a:	8e 31 ff f7 	cmpbleb	r14, r15, \*\-0x200
+  66:	8e 30 81 f7 	cmpbleb	r14, r15, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  6a:	8e 31 ff f7 	cmpbleb	r14, r15, 0x[0-9a-f]* [-_<>+0-9a-z]*
   6e:	00 ff 
-  70:	c9 30 1b 17 	cmpbleb	\$0x10, r1, \*\+0x36
-  74:	c9 31 80 27 	cmpbleb	\$0x10, r2, \*\-0xffff02
+  70:	c9 30 1b 17 	cmpbleb	\$0x10, r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  74:	c9 31 80 27 	cmpbleb	\$0x10, r2, 0x[0-9a-f]* [-_<>+0-9a-z]*
   78:	7f 00 
 
 0000007a <cmpblob>:
-  7a:	83 30 e4 4a 	cmpblob	r3, r4, \*\-0x38
-  7e:	85 31 80 6a 	cmpblob	r5, r6, \*\-0xfffffe
+  7a:	83 30 e4 4a 	cmpblob	r3, r4, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  7e:	85 31 80 6a 	cmpblob	r5, r6, 0x[0-9a-f]* [-_<>+0-9a-z]*
   82:	01 00 
-  84:	ca 30 12 7a 	cmpblob	\$0x20, r7, \*\+0x24
-  88:	ca 31 7f 8a 	cmpblob	\$0x20, r8, \*\+0xfffffe
+  84:	ca 30 12 7a 	cmpblob	\$0x20, r7, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  88:	ca 31 7f 8a 	cmpblob	\$0x20, r8, 0x[0-9a-f]* [-_<>+0-9a-z]*
   8c:	ff ff 
 
 0000008e <cmpbhsb>:
-  8e:	89 30 78 ab 	cmpbhsb	r9, r10, \*\+0xf0
-  92:	8b 31 00 cb 	cmpbhsb	r11, r12, \*\+0x102
+  8e:	89 30 78 ab 	cmpbhsb	r9, r10, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  92:	8b 31 00 cb 	cmpbhsb	r11, r12, 0x[0-9a-f]* [-_<>+0-9a-z]*
   96:	81 00 
-  98:	ca 30 81 db 	cmpbhsb	\$0x20, r13, \*\-0xfe
-  9c:	cb 31 00 eb 	cmpbhsb	\$0x14, r14, \*\+0x1000
+  98:	ca 30 81 db 	cmpbhsb	\$0x20, r13, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  9c:	cb 31 00 eb 	cmpbhsb	\$0x14, r14, 0x[0-9a-f]* [-_<>+0-9a-z]*
   a0:	00 08 
 
 000000a2 <cmpbltb>:
-  a2:	8f 30 08 ec 	cmpbltb	r15, r14, \*\+0x10
-  a6:	8f 31 00 1c 	cmpbltb	r15, r1, \*\+0x462
+  a2:	8f 30 08 ec 	cmpbltb	r15, r14, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  a6:	8f 31 00 1c 	cmpbltb	r15, r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
   aa:	31 02 
-  ac:	cc 30 f8 2c 	cmpbltb	\$0xc, r2, \*\-0x10
-  b0:	cc 31 c0 3c 	cmpbltb	\$0xc, r3, \*\-0x800000
+  ac:	cc 30 f8 2c 	cmpbltb	\$0xc, r2, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  b0:	cc 31 c0 3c 	cmpbltb	\$0xc, r3, 0x[0-9a-f]* [-_<>+0-9a-z]*
   b4:	00 00 
 
 000000b6 <cmpbgeb>:
-  b6:	84 30 00 5d 	cmpbgeb	r4, r5, \*\+0x0
-  ba:	86 31 20 7d 	cmpbgeb	r6, r7, \*\+0x400000
+  b6:	84 30 00 5d 	cmpbgeb	r4, r5, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  ba:	86 31 20 7d 	cmpbgeb	r6, r7, 0x[0-9a-f]* [-_<>+0-9a-z]*
   be:	00 00 
-  c0:	cd 30 00 8d 	cmpbgeb	\$0x30, r8, \*\+0x0
-  c4:	cd 31 f8 9d 	cmpbgeb	\$0x30, r9, \*\-0x100000
+  c0:	cd 30 00 8d 	cmpbgeb	\$0x30, r8, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  c4:	cd 31 f8 9d 	cmpbgeb	\$0x30, r9, 0x[0-9a-f]* [-_<>+0-9a-z]*
   c8:	00 00 
 
 000000ca <cmpbeqw>:
-  ca:	91 30 2b 20 	cmpbeqw	r1, r2, \*\+0x56
-  ce:	93 31 00 40 	cmpbeqw	r3, r4, \*\+0x4348
+  ca:	91 30 2b 20 	cmpbeqw	r1, r2, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  ce:	93 31 00 40 	cmpbeqw	r3, r4, 0x[0-9a-f]* [-_<>+0-9a-z]*
   d2:	a4 21 
-  d4:	d0 30 1b 50 	cmpbeqw	\$0x0, r5, \*\+0x36
-  d8:	d1 31 1a 60 	cmpbeqw	\$0x1, r6, \*\+0x345678
+  d4:	d0 30 1b 50 	cmpbeqw	\$0x0, r5, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  d8:	d1 31 1a 60 	cmpbeqw	\$0x1, r6, 0x[0-9a-f]* [-_<>+0-9a-z]*
   dc:	3c 2b 
 
 000000de <cmpbnew>:
-  de:	97 30 7d 81 	cmpbnew	r7, r8, \*\+0xfa
-  e2:	99 31 00 a1 	cmpbnew	r9, r10, \*\+0xf000
+  de:	97 30 7d 81 	cmpbnew	r7, r8, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  e2:	99 31 00 a1 	cmpbnew	r9, r10, 0x[0-9a-f]* [-_<>+0-9a-z]*
   e6:	00 78 
-  e8:	d2 30 01 b1 	cmpbnew	\$0x2, r11, \*\+0x2
-  ec:	d3 31 7f c1 	cmpbnew	\$0x3, r12, \*\+0xfffffe
+  e8:	d2 30 01 b1 	cmpbnew	\$0x2, r11, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  ec:	d3 31 7f c1 	cmpbnew	\$0x3, r12, 0x[0-9a-f]* [-_<>+0-9a-z]*
   f0:	ff ff 
 
 000000f2 <cmpbhiw>:
-  f2:	9d 31 00 e4 	cmpbhiw	r13, r14, \*\+0x100
+  f2:	9d 31 00 e4 	cmpbhiw	r13, r14, 0x[0-9a-f]* [-_<>+0-9a-z]*
   f6:	80 00 
-  f8:	9f 31 00 e4 	cmpbhiw	r15, r14, \*\+0x102
+  f8:	9f 31 00 e4 	cmpbhiw	r15, r14, 0x[0-9a-f]* [-_<>+0-9a-z]*
   fc:	81 00 
-  fe:	d4 30 ff f4 	cmpbhiw	\$0x4, r15, \*\-0x2
- 102:	d5 31 ff 14 	cmpbhiw	\$0xfffffffc, r1, \*\-0x104
+  fe:	d4 30 ff f4 	cmpbhiw	\$0x4, r15, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 102:	d5 31 ff 14 	cmpbhiw	\$0xfffffffc, r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
  106:	7e ff 
 
 00000108 <cmpblsw>:
- 108:	92 30 3c 35 	cmpblsw	r2, r3, \*\+0x78
- 10c:	94 31 00 55 	cmpblsw	r4, r5, \*\+0x100
+ 108:	92 30 3c 35 	cmpblsw	r2, r3, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 10c:	94 31 00 55 	cmpblsw	r4, r5, 0x[0-9a-f]* [-_<>+0-9a-z]*
  110:	80 00 
- 112:	d6 30 84 65 	cmpblsw	\$0xffffffff, r6, \*\-0xf8
- 116:	d7 31 ff 75 	cmpblsw	\$0x7, r7, \*\-0x102
+ 112:	d6 30 84 65 	cmpblsw	\$0xffffffff, r6, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 116:	d7 31 ff 75 	cmpblsw	\$0x7, r7, 0x[0-9a-f]* [-_<>+0-9a-z]*
  11a:	7f ff 
 
 0000011c <cmpbgtw>:
- 11c:	98 30 83 96 	cmpbgtw	r8, r9, \*\-0xfa
- 120:	9a 31 00 b6 	cmpbgtw	r10, r11, \*\+0xfc0
+ 11c:	98 30 83 96 	cmpbgtw	r8, r9, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 120:	9a 31 00 b6 	cmpbgtw	r10, r11, 0x[0-9a-f]* [-_<>+0-9a-z]*
  124:	e0 07 
- 126:	d8 30 7f c6 	cmpbgtw	\$0x8, r12, \*\+0xfe
- 12a:	d9 31 7f d6 	cmpbgtw	\$0x10, r13, \*\+0xfffff2
+ 126:	d8 30 7f c6 	cmpbgtw	\$0x8, r12, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 12a:	d9 31 7f d6 	cmpbgtw	\$0x10, r13, 0x[0-9a-f]* [-_<>+0-9a-z]*
  12e:	f9 ff 
 
 00000130 <cmpblew>:
- 130:	9e 30 81 f7 	cmpblew	r14, r15, \*\-0xfe
- 134:	9e 31 ff f7 	cmpblew	r14, r15, \*\-0x200
+ 130:	9e 30 81 f7 	cmpblew	r14, r15, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 134:	9e 31 ff f7 	cmpblew	r14, r15, 0x[0-9a-f]* [-_<>+0-9a-z]*
  138:	00 ff 
- 13a:	d9 30 1b 17 	cmpblew	\$0x10, r1, \*\+0x36
- 13e:	d9 31 80 27 	cmpblew	\$0x10, r2, \*\-0xffff02
+ 13a:	d9 30 1b 17 	cmpblew	\$0x10, r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 13e:	d9 31 80 27 	cmpblew	\$0x10, r2, 0x[0-9a-f]* [-_<>+0-9a-z]*
  142:	7f 00 
 
 00000144 <cmpblow>:
- 144:	93 30 e4 4a 	cmpblow	r3, r4, \*\-0x38
- 148:	95 31 80 6a 	cmpblow	r5, r6, \*\-0xfffffe
+ 144:	93 30 e4 4a 	cmpblow	r3, r4, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 148:	95 31 80 6a 	cmpblow	r5, r6, 0x[0-9a-f]* [-_<>+0-9a-z]*
  14c:	01 00 
- 14e:	da 30 12 7a 	cmpblow	\$0x20, r7, \*\+0x24
- 152:	da 31 7f 8a 	cmpblow	\$0x20, r8, \*\+0xfffffe
+ 14e:	da 30 12 7a 	cmpblow	\$0x20, r7, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 152:	da 31 7f 8a 	cmpblow	\$0x20, r8, 0x[0-9a-f]* [-_<>+0-9a-z]*
  156:	ff ff 
 
 00000158 <cmpbhsw>:
- 158:	99 30 78 ab 	cmpbhsw	r9, r10, \*\+0xf0
- 15c:	9b 31 00 cb 	cmpbhsw	r11, r12, \*\+0x102
+ 158:	99 30 78 ab 	cmpbhsw	r9, r10, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 15c:	9b 31 00 cb 	cmpbhsw	r11, r12, 0x[0-9a-f]* [-_<>+0-9a-z]*
  160:	81 00 
- 162:	da 30 81 db 	cmpbhsw	\$0x20, r13, \*\-0xfe
- 166:	db 31 00 eb 	cmpbhsw	\$0x14, r14, \*\+0x1000
+ 162:	da 30 81 db 	cmpbhsw	\$0x20, r13, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 166:	db 31 00 eb 	cmpbhsw	\$0x14, r14, 0x[0-9a-f]* [-_<>+0-9a-z]*
  16a:	00 08 
 
 0000016c <cmpbltw>:
- 16c:	9f 30 08 ec 	cmpbltw	r15, r14, \*\+0x10
- 170:	9f 31 00 1c 	cmpbltw	r15, r1, \*\+0x462
+ 16c:	9f 30 08 ec 	cmpbltw	r15, r14, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 170:	9f 31 00 1c 	cmpbltw	r15, r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
  174:	31 02 
- 176:	dc 30 f8 2c 	cmpbltw	\$0xc, r2, \*\-0x10
- 17a:	dc 31 c0 3c 	cmpbltw	\$0xc, r3, \*\-0x800000
+ 176:	dc 30 f8 2c 	cmpbltw	\$0xc, r2, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 17a:	dc 31 c0 3c 	cmpbltw	\$0xc, r3, 0x[0-9a-f]* [-_<>+0-9a-z]*
  17e:	00 00 
 
 00000180 <cmpbgew>:
- 180:	94 30 00 5d 	cmpbgew	r4, r5, \*\+0x0
- 184:	96 31 20 7d 	cmpbgew	r6, r7, \*\+0x400000
+ 180:	94 30 00 5d 	cmpbgew	r4, r5, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 184:	96 31 20 7d 	cmpbgew	r6, r7, 0x[0-9a-f]* [-_<>+0-9a-z]*
  188:	00 00 
- 18a:	dd 30 00 8d 	cmpbgew	\$0x30, r8, \*\+0x0
- 18e:	dd 31 f8 9d 	cmpbgew	\$0x30, r9, \*\-0x100000
+ 18a:	dd 30 00 8d 	cmpbgew	\$0x30, r8, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 18e:	dd 31 f8 9d 	cmpbgew	\$0x30, r9, 0x[0-9a-f]* [-_<>+0-9a-z]*
  192:	00 00 
 
 00000194 <cmpbeqd>:
- 194:	a1 30 2b 20 	cmpbeqd	r1, r2, \*\+0x56
- 198:	a3 31 00 40 	cmpbeqd	r3, r4, \*\+0x4348
+ 194:	a1 30 2b 20 	cmpbeqd	r1, r2, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 198:	a3 31 00 40 	cmpbeqd	r3, r4, 0x[0-9a-f]* [-_<>+0-9a-z]*
  19c:	a4 21 
- 19e:	e0 30 1b 50 	cmpbeqd	\$0x0, r5, \*\+0x36
- 1a2:	e1 31 1a 60 	cmpbeqd	\$0x1, r6, \*\+0x345678
+ 19e:	e0 30 1b 50 	cmpbeqd	\$0x0, r5, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 1a2:	e1 31 1a 60 	cmpbeqd	\$0x1, r6, 0x[0-9a-f]* [-_<>+0-9a-z]*
  1a6:	3c 2b 
 
 000001a8 <cmpbned>:
- 1a8:	a7 30 7d 81 	cmpbned	r7, r8, \*\+0xfa
- 1ac:	a9 31 00 a1 	cmpbned	r9, r10, \*\+0xf000
+ 1a8:	a7 30 7d 81 	cmpbned	r7, r8, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 1ac:	a9 31 00 a1 	cmpbned	r9, r10, 0x[0-9a-f]* [-_<>+0-9a-z]*
  1b0:	00 78 
- 1b2:	e2 30 01 b1 	cmpbned	\$0x2, r11, \*\+0x2
- 1b6:	e3 31 7f c1 	cmpbned	\$0x3, r12, \*\+0xfffffe
+ 1b2:	e2 30 01 b1 	cmpbned	\$0x2, r11, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 1b6:	e3 31 7f c1 	cmpbned	\$0x3, r12, 0x[0-9a-f]* [-_<>+0-9a-z]*
  1ba:	ff ff 
 
 000001bc <cmpbhid>:
- 1bc:	ad 31 00 e4 	cmpbhid	r13, r14, \*\+0x100
+ 1bc:	ad 31 00 e4 	cmpbhid	r13, r14, 0x[0-9a-f]* [-_<>+0-9a-z]*
  1c0:	80 00 
- 1c2:	af 31 00 e4 	cmpbhid	r15, r14, \*\+0x102
+ 1c2:	af 31 00 e4 	cmpbhid	r15, r14, 0x[0-9a-f]* [-_<>+0-9a-z]*
  1c6:	81 00 
- 1c8:	e4 30 ff f4 	cmpbhid	\$0x4, r15, \*\-0x2
- 1cc:	e5 31 ff 14 	cmpbhid	\$0xfffffffc, r1, \*\-0x104
+ 1c8:	e4 30 ff f4 	cmpbhid	\$0x4, r15, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 1cc:	e5 31 ff 14 	cmpbhid	\$0xfffffffc, r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
  1d0:	7e ff 
 
 000001d2 <cmpblsd>:
- 1d2:	a2 30 3c 35 	cmpblsd	r2, r3, \*\+0x78
- 1d6:	a4 31 00 55 	cmpblsd	r4, r5, \*\+0x100
+ 1d2:	a2 30 3c 35 	cmpblsd	r2, r3, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 1d6:	a4 31 00 55 	cmpblsd	r4, r5, 0x[0-9a-f]* [-_<>+0-9a-z]*
  1da:	80 00 
- 1dc:	e6 30 84 65 	cmpblsd	\$0xffffffff, r6, \*\-0xf8
- 1e0:	e7 31 ff 75 	cmpblsd	\$0x7, r7, \*\-0x102
+ 1dc:	e6 30 84 65 	cmpblsd	\$0xffffffff, r6, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 1e0:	e7 31 ff 75 	cmpblsd	\$0x7, r7, 0x[0-9a-f]* [-_<>+0-9a-z]*
  1e4:	7f ff 
 
 000001e6 <cmpbgtd>:
- 1e6:	a8 30 83 96 	cmpbgtd	r8, r9, \*\-0xfa
- 1ea:	aa 31 00 b6 	cmpbgtd	r10, r11, \*\+0xfc0
+ 1e6:	a8 30 83 96 	cmpbgtd	r8, r9, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 1ea:	aa 31 00 b6 	cmpbgtd	r10, r11, 0x[0-9a-f]* [-_<>+0-9a-z]*
  1ee:	e0 07 
- 1f0:	e8 30 7f c6 	cmpbgtd	\$0x8, r12, \*\+0xfe
- 1f4:	e9 31 7f d6 	cmpbgtd	\$0x10, r13, \*\+0xfffff2
+ 1f0:	e8 30 7f c6 	cmpbgtd	\$0x8, r12, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 1f4:	e9 31 7f d6 	cmpbgtd	\$0x10, r13, 0x[0-9a-f]* [-_<>+0-9a-z]*
  1f8:	f9 ff 
 
 000001fa <cmpbled>:
- 1fa:	ae 30 81 f7 	cmpbled	r14, r15, \*\-0xfe
- 1fe:	ae 31 ff f7 	cmpbled	r14, r15, \*\-0x200
+ 1fa:	ae 30 81 f7 	cmpbled	r14, r15, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 1fe:	ae 31 ff f7 	cmpbled	r14, r15, 0x[0-9a-f]* [-_<>+0-9a-z]*
  202:	00 ff 
- 204:	e9 30 1b 17 	cmpbled	\$0x10, r1, \*\+0x36
- 208:	e9 31 80 27 	cmpbled	\$0x10, r2, \*\-0xffff02
+ 204:	e9 30 1b 17 	cmpbled	\$0x10, r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 208:	e9 31 80 27 	cmpbled	\$0x10, r2, 0x[0-9a-f]* [-_<>+0-9a-z]*
  20c:	7f 00 
 
 0000020e <cmpblod>:
- 20e:	a3 30 e4 4a 	cmpblod	r3, r4, \*\-0x38
- 212:	a5 31 80 6a 	cmpblod	r5, r6, \*\-0xfffffe
+ 20e:	a3 30 e4 4a 	cmpblod	r3, r4, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 212:	a5 31 80 6a 	cmpblod	r5, r6, 0x[0-9a-f]* [-_<>+0-9a-z]*
  216:	01 00 
- 218:	ea 30 12 7a 	cmpblod	\$0x20, r7, \*\+0x24
- 21c:	ea 31 7f 8a 	cmpblod	\$0x20, r8, \*\+0xfffffe
+ 218:	ea 30 12 7a 	cmpblod	\$0x20, r7, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 21c:	ea 31 7f 8a 	cmpblod	\$0x20, r8, 0x[0-9a-f]* [-_<>+0-9a-z]*
  220:	ff ff 
 
 00000222 <cmpbhsd>:
- 222:	a9 30 78 ab 	cmpbhsd	r9, r10, \*\+0xf0
- 226:	ab 31 00 cb 	cmpbhsd	r11, r12, \*\+0x102
+ 222:	a9 30 78 ab 	cmpbhsd	r9, r10, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 226:	ab 31 00 cb 	cmpbhsd	r11, r12, 0x[0-9a-f]* [-_<>+0-9a-z]*
  22a:	81 00 
- 22c:	ea 30 81 db 	cmpbhsd	\$0x20, r13, \*\-0xfe
- 230:	eb 31 00 eb 	cmpbhsd	\$0x14, r14, \*\+0x1000
+ 22c:	ea 30 81 db 	cmpbhsd	\$0x20, r13, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 230:	eb 31 00 eb 	cmpbhsd	\$0x14, r14, 0x[0-9a-f]* [-_<>+0-9a-z]*
  234:	00 08 
 
 00000236 <cmpbltd>:
- 236:	af 30 08 ec 	cmpbltd	r15, r14, \*\+0x10
- 23a:	af 31 00 1c 	cmpbltd	r15, r1, \*\+0x462
+ 236:	af 30 08 ec 	cmpbltd	r15, r14, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 23a:	af 31 00 1c 	cmpbltd	r15, r1, 0x[0-9a-f]* [-_<>+0-9a-z]*
  23e:	31 02 
- 240:	ec 30 f8 2c 	cmpbltd	\$0xc, r2, \*\-0x10
- 244:	ec 31 c0 3c 	cmpbltd	\$0xc, r3, \*\-0x800000
+ 240:	ec 30 f8 2c 	cmpbltd	\$0xc, r2, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 244:	ec 31 c0 3c 	cmpbltd	\$0xc, r3, 0x[0-9a-f]* [-_<>+0-9a-z]*
  248:	00 00 
 
 0000024a <cmpbged>:
- 24a:	a4 30 00 5d 	cmpbged	r4, r5, \*\+0x0
- 24e:	a6 31 20 7d 	cmpbged	r6, r7, \*\+0x400000
+ 24a:	a4 30 00 5d 	cmpbged	r4, r5, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 24e:	a6 31 20 7d 	cmpbged	r6, r7, 0x[0-9a-f]* [-_<>+0-9a-z]*
  252:	00 00 
- 254:	ed 30 00 8d 	cmpbged	\$0x30, r8, \*\+0x0
- 258:	ed 31 f8 9d 	cmpbged	\$0x30, r9, \*\-0x100000
+ 254:	ed 30 00 8d 	cmpbged	\$0x30, r8, 0x[0-9a-f]* [-_<>+0-9a-z]*
+ 258:	ed 31 f8 9d 	cmpbged	\$0x30, r9, 0x[0-9a-f]* [-_<>+0-9a-z]*
  25c:	00 00 
diff --git a/gas/testsuite/gas/crx/cop_insn.d b/gas/testsuite/gas/crx/cop_insn.d
index 1ec8ddf..322089c 100644
--- a/gas/testsuite/gas/crx/cop_insn.d
+++ b/gas/testsuite/gas/crx/cop_insn.d
@@ -52,8 +52,8 @@ Disassembly of section .text:
   40:	90 04 
 
 00000042 <bcop>:
-  42:	13 30 48 77 	bcop	\$0x7, \$0x3, \*\+0x90
-  46:	1c 31 fa 76 	bcop	\$0x6, \$0xc, \*\-0xbcdfe
+  42:	13 30 48 77 	bcop	\$0x7, \$0x3, 0x[0-9a-f]* [-_<>+0-9a-z]*
+  46:	1c 31 fa 76 	bcop	\$0x6, \$0xc, 0x[0-9a-f]* [-_<>+0-9a-z]*
   4a:	01 19 
 
 0000004c <cpdop>:
diff --git a/gas/testsuite/gas/crx/load_stor_insn.d b/gas/testsuite/gas/crx/load_stor_insn.d
index 805e3ea..fadf287 100644
--- a/gas/testsuite/gas/crx/load_stor_insn.d
+++ b/gas/testsuite/gas/crx/load_stor_insn.d
@@ -7,11 +7,11 @@
 Disassembly of section .text:
 
 00000000 <loadb>:
-   0:	01 33 00 00 	loadb	0x632, r1
+   0:	01 33 00 00 	loadb	0x632 [-_<>+0-9a-z]*, r1
    4:	32 06 
-   6:	02 33 08 00 	loadb	0x87632, r2
+   6:	02 33 08 00 	loadb	0x87632 [-_<>+0-9a-z]*, r2
    a:	32 76 
-   c:	03 32 34 12 	loadb	0xffff1234, r3
+   c:	03 32 34 12 	loadb	0xffff1234 [-_<>+0-9a-z]*, r3
   10:	95 84       	loadb	0x9\(r5\), r4
   12:	0f 86       	loadb	0x0\(r15\), r6
   14:	e6 87 56 04 	loadb	0x456\(r6\), r7
@@ -28,11 +28,11 @@ Disassembly of section .text:
   3a:	6f fd 
 
 0000003c <loadw>:
-  3c:	11 33 00 00 	loadw	0x19a, r1
+  3c:	11 33 00 00 	loadw	0x19a [-_<>+0-9a-z]*, r1
   40:	9a 01 
-  42:	12 33 01 00 	loadw	0x15650, r2
+  42:	12 33 01 00 	loadw	0x15650 [-_<>+0-9a-z]*, r2
   46:	50 56 
-  48:	13 32 06 00 	loadw	0xffff0006, r3
+  48:	13 32 06 00 	loadw	0xffff0006 [-_<>+0-9a-z]*, r3
   4c:	1f 94       	loadw	0x2\(r15\), r4
   4e:	0f 96       	loadw	0x0\(r15\), r6
   50:	e6 97 2e 01 	loadw	0x12e\(r6\), r7
@@ -49,11 +49,11 @@ Disassembly of section .text:
   76:	a9 99 
 
 00000078 <loadd>:
-  78:	21 33 00 00 	loadd	0xfff1, r1
+  78:	21 33 00 00 	loadd	0xfff1 [-_<>+0-9a-z]*, r1
   7c:	f1 ff 
-  7e:	22 33 ef ff 	loadd	0xffefffef, r2
+  7e:	22 33 ef ff 	loadd	0xffefffef [-_<>+0-9a-z]*, r2
   82:	ef ff 
-  84:	23 32 34 12 	loadd	0xffff1234, r3
+  84:	23 32 34 12 	loadd	0xffff1234 [-_<>+0-9a-z]*, r3
   88:	e0 a4 0a 00 	loadd	0xa\(r0\), r4
   8c:	0f a6       	loadd	0x0\(r15\), r6
   8e:	e6 a7 00 01 	loadd	0x100\(r6\), r7
@@ -70,11 +70,11 @@ Disassembly of section .text:
   b4:	51 fe 
 
 000000b6 <storb>:
-  b6:	01 35 00 00 	storb	r1, 0x632
+  b6:	01 35 00 00 	storb	r1, 0x632 [-_<>+0-9a-z]*
   ba:	32 06 
-  bc:	02 35 08 00 	storb	r2, 0x87632
+  bc:	02 35 08 00 	storb	r2, 0x87632 [-_<>+0-9a-z]*
   c0:	32 76 
-  c2:	03 34 34 12 	storb	r3, 0xffff1234
+  c2:	03 34 34 12 	storb	r3, 0xffff1234 [-_<>+0-9a-z]*
   c6:	95 c4       	storb	r4, 0x9\(r5\)
   c8:	0f c6       	storb	r6, 0x0\(r15\)
   ca:	e6 c7 56 04 	storb	r7, 0x456\(r6\)
@@ -94,11 +94,11 @@ Disassembly of section .text:
   fa:	13 f0 
 
 000000fc <storw>:
-  fc:	11 35 00 00 	storw	r1, 0x19a
+  fc:	11 35 00 00 	storw	r1, 0x19a [-_<>+0-9a-z]*
  100:	9a 01 
- 102:	12 35 01 00 	storw	r2, 0x15650
+ 102:	12 35 01 00 	storw	r2, 0x15650 [-_<>+0-9a-z]*
  106:	50 56 
- 108:	13 34 06 00 	storw	r3, 0xffff0006
+ 108:	13 34 06 00 	storw	r3, 0xffff0006 [-_<>+0-9a-z]*
  10c:	1f d4       	storw	r4, 0x2\(r15\)
  10e:	0f d6       	storw	r6, 0x0\(r15\)
  110:	e6 d7 2e 01 	storw	r7, 0x12e\(r6\)
@@ -113,17 +113,17 @@ Disassembly of section .text:
  130:	25 00 
  132:	de 35 ff f7 	storw	r14, 0x3f99a9\(r15,r7,8\)
  136:	a9 99 
- 138:	11 37 00 00 	storw	\$0x1, 0x632
+ 138:	11 37 00 00 	storw	\$0x1, 0x632 [-_<>+0-9a-z]*
  13c:	32 06 
- 13e:	17 37 08 00 	storw	\$0x7, 0x87632
+ 13e:	17 37 08 00 	storw	\$0x7, 0x87632 [-_<>+0-9a-z]*
  142:	32 76 
 
 00000144 <stord>:
- 144:	21 35 00 00 	stord	r1, 0xfff1
+ 144:	21 35 00 00 	stord	r1, 0xfff1 [-_<>+0-9a-z]*
  148:	f1 ff 
- 14a:	22 35 ef ff 	stord	r2, 0xffefffef
+ 14a:	22 35 ef ff 	stord	r2, 0xffefffef [-_<>+0-9a-z]*
  14e:	ef ff 
- 150:	23 34 01 00 	stord	r3, 0xffff0001
+ 150:	23 34 01 00 	stord	r3, 0xffff0001 [-_<>+0-9a-z]*
  154:	e0 e4 0a 00 	stord	r4, 0xa\(r0\)
  158:	0f e6       	stord	r6, 0x0\(r15\)
  15a:	e6 e7 00 01 	stord	r7, 0x100\(r6\)