2008-04-10 Andreas Krebbel <krebbel1@de.ibm.com>

	* s390-mkopc.c (s390_cond_ext_format): Add back the mnemonic
	extensions for conditional jumps (o, p, m, nz, z, nm, np, no).
	(s390_crb_extensions): New extensions table.
	(insertExpandedMnemonic): Handle '$' tag.
	* s390-opc.txt: Remove conditional jump variants which can now
	be expanded automatically.
	Replace '*' tag with '$' in the compare and branch instructions.

2008-04-10  Andreas Krebbel  <krebbel1@de.ibm.com>

	* gas/s390/zarch-z10.d: Map the compare and branch variants
	with odd condition code mask to version with an even mask.

5 files changed, 301 insertions, 276 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 89280cc..3ff7e45 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-10  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+	* gas/s390/zarch-z10.d: Map the compare and branch variants
+	with odd condition code mask to version with an even mask.
+
 2008-04-07  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* gas/i386/att-regs.s: Add AVX register test.
diff --git a/gas/testsuite/gas/s390/zarch-z10.d b/gas/testsuite/gas/s390/zarch-z10.d
index bc0f7d8..9af2bfc 100644
--- a/gas/testsuite/gas/s390/zarch-z10.d
+++ b/gas/testsuite/gas/s390/zarch-z10.d
@@ -13,162 +13,162 @@ Disassembly of section .text:
 .*:	c6 6d 00 00 00 00 [ 	]*crl	%r6,18 <foo\+0x18>
 .*:	c6 68 00 00 00 00 [ 	]*cgrl	%r6,1e <foo\+0x1e>
 .*:	c6 6c 00 00 00 00 [ 	]*cgfrl	%r6,24 <foo\+0x24>
-.*:	ec 67 84 57 a0 f6 [ 	]*crbhe	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 a0 f6 [ 	]*crbnl	%r6,%r7,1111\(%r8\)
 .*:	ec 67 84 57 20 f6 [ 	]*crbh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 30 f6 [ 	]*crbnle	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 20 f6 [ 	]*crbh	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 40 f6 [ 	]*crbl	%r6,%r7,1111\(%r8\)
 .*:	ec 67 84 57 40 f6 [ 	]*crbl	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 50 f6 [ 	]*crbnhe	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 60 f6 [ 	]*crblh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 70 f6 [ 	]*crbne	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 60 f6 [ 	]*crbne	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 60 f6 [ 	]*crbne	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 80 f6 [ 	]*crbe	%r6,%r7,1111\(%r8\)
 .*:	ec 67 84 57 80 f6 [ 	]*crbe	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 90 f6 [ 	]*crbnlh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 a0 f6 [ 	]*crbhe	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 b0 f6 [ 	]*crbnl	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 c0 f6 [ 	]*crble	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 d0 f6 [ 	]*crbnh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 a0 e4 [ 	]*cgrbhe	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 a0 f6 [ 	]*crbnl	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 a0 f6 [ 	]*crbnl	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 c0 f6 [ 	]*crbnh	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 c0 f6 [ 	]*crbnh	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 a0 e4 [ 	]*cgrbnl	%r6,%r7,1111\(%r8\)
 .*:	ec 67 84 57 20 e4 [ 	]*cgrbh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 30 e4 [ 	]*cgrbnle	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 20 e4 [ 	]*cgrbh	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 40 e4 [ 	]*cgrbl	%r6,%r7,1111\(%r8\)
 .*:	ec 67 84 57 40 e4 [ 	]*cgrbl	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 50 e4 [ 	]*cgrbnhe	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 60 e4 [ 	]*cgrblh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 70 e4 [ 	]*cgrbne	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 60 e4 [ 	]*cgrbne	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 60 e4 [ 	]*cgrbne	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 80 e4 [ 	]*cgrbe	%r6,%r7,1111\(%r8\)
 .*:	ec 67 84 57 80 e4 [ 	]*cgrbe	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 90 e4 [ 	]*cgrbnlh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 a0 e4 [ 	]*cgrbhe	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 b0 e4 [ 	]*cgrbnl	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 c0 e4 [ 	]*cgrble	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 d0 e4 [ 	]*cgrbnh	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 a0 e4 [ 	]*cgrbnl	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 a0 e4 [ 	]*cgrbnl	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 c0 e4 [ 	]*cgrbnh	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 c0 e4 [ 	]*cgrbnh	%r6,%r7,1111\(%r8\)
 .*:	ec 67 00 00 a0 76 [ 	]*crj	%r6,%r7,10,c6 <foo\+0xc6>
 .*:	ec 67 00 00 20 76 [ 	]*crj	%r6,%r7,2,cc <foo\+0xcc>
-.*:	ec 67 00 00 30 76 [ 	]*crj	%r6,%r7,3,d2 <foo\+0xd2>
+.*:	ec 67 00 00 20 76 [ 	]*crj	%r6,%r7,2,d2 <foo\+0xd2>
 .*:	ec 67 00 00 40 76 [ 	]*crj	%r6,%r7,4,d8 <foo\+0xd8>
-.*:	ec 67 00 00 50 76 [ 	]*crj	%r6,%r7,5,de <foo\+0xde>
+.*:	ec 67 00 00 40 76 [ 	]*crj	%r6,%r7,4,de <foo\+0xde>
 .*:	ec 67 00 00 60 76 [ 	]*crj	%r6,%r7,6,e4 <foo\+0xe4>
-.*:	ec 67 00 00 70 76 [ 	]*crj	%r6,%r7,7,ea <foo\+0xea>
+.*:	ec 67 00 00 60 76 [ 	]*crj	%r6,%r7,6,ea <foo\+0xea>
 .*:	ec 67 00 00 80 76 [ 	]*crj	%r6,%r7,8,f0 <foo\+0xf0>
-.*:	ec 67 00 00 90 76 [ 	]*crj	%r6,%r7,9,f6 <foo\+0xf6>
+.*:	ec 67 00 00 80 76 [ 	]*crj	%r6,%r7,8,f6 <foo\+0xf6>
 .*:	ec 67 00 00 a0 76 [ 	]*crj	%r6,%r7,10,fc <foo\+0xfc>
-.*:	ec 67 00 00 b0 76 [ 	]*crj	%r6,%r7,11,102 <foo\+0x102>
+.*:	ec 67 00 00 a0 76 [ 	]*crj	%r6,%r7,10,102 <foo\+0x102>
 .*:	ec 67 00 00 c0 76 [ 	]*crj	%r6,%r7,12,108 <foo\+0x108>
-.*:	ec 67 00 00 d0 76 [ 	]*crj	%r6,%r7,13,10e <foo\+0x10e>
-.*:	ec 67 00 00 a0 64 [ 	]*cgrjhe	%r6,%r7,114 <foo\+0x114>
+.*:	ec 67 00 00 c0 76 [ 	]*crj	%r6,%r7,12,10e <foo\+0x10e>
+.*:	ec 67 00 00 a0 64 [ 	]*cgrjnl	%r6,%r7,114 <foo\+0x114>
 .*:	ec 67 00 00 20 64 [ 	]*cgrjh	%r6,%r7,11a <foo\+0x11a>
-.*:	ec 67 00 00 30 64 [ 	]*cgrjnle	%r6,%r7,120 <foo\+0x120>
+.*:	ec 67 00 00 20 64 [ 	]*cgrjh	%r6,%r7,120 <foo\+0x120>
 .*:	ec 67 00 00 40 64 [ 	]*cgrjl	%r6,%r7,126 <foo\+0x126>
-.*:	ec 67 00 00 50 64 [ 	]*cgrjnhe	%r6,%r7,12c <foo\+0x12c>
-.*:	ec 67 00 00 60 64 [ 	]*cgrjlh	%r6,%r7,132 <foo\+0x132>
-.*:	ec 67 00 00 70 64 [ 	]*cgrjne	%r6,%r7,138 <foo\+0x138>
+.*:	ec 67 00 00 40 64 [ 	]*cgrjl	%r6,%r7,12c <foo\+0x12c>
+.*:	ec 67 00 00 60 64 [ 	]*cgrjne	%r6,%r7,132 <foo\+0x132>
+.*:	ec 67 00 00 60 64 [ 	]*cgrjne	%r6,%r7,138 <foo\+0x138>
 .*:	ec 67 00 00 80 64 [ 	]*cgrje	%r6,%r7,13e <foo\+0x13e>
-.*:	ec 67 00 00 90 64 [ 	]*cgrjnlh	%r6,%r7,144 <foo\+0x144>
-.*:	ec 67 00 00 a0 64 [ 	]*cgrjhe	%r6,%r7,14a <foo\+0x14a>
-.*:	ec 67 00 00 b0 64 [ 	]*cgrjnl	%r6,%r7,150 <foo\+0x150>
-.*:	ec 67 00 00 c0 64 [ 	]*cgrjle	%r6,%r7,156 <foo\+0x156>
-.*:	ec 67 00 00 d0 64 [ 	]*cgrjnh	%r6,%r7,15c <foo\+0x15c>
-.*:	ec 6a 74 57 d6 fe [ 	]*cibhe	%r6,-42,1111\(%r7\)
+.*:	ec 67 00 00 80 64 [ 	]*cgrje	%r6,%r7,144 <foo\+0x144>
+.*:	ec 67 00 00 a0 64 [ 	]*cgrjnl	%r6,%r7,14a <foo\+0x14a>
+.*:	ec 67 00 00 a0 64 [ 	]*cgrjnl	%r6,%r7,150 <foo\+0x150>
+.*:	ec 67 00 00 c0 64 [ 	]*cgrjnh	%r6,%r7,156 <foo\+0x156>
+.*:	ec 67 00 00 c0 64 [ 	]*cgrjnh	%r6,%r7,15c <foo\+0x15c>
+.*:	ec 6a 74 57 d6 fe [ 	]*cibnl	%r6,-42,1111\(%r7\)
 .*:	ec 62 74 57 d6 fe [ 	]*cibh	%r6,-42,1111\(%r7\)
-.*:	ec 63 74 57 d6 fe [ 	]*cibnle	%r6,-42,1111\(%r7\)
+.*:	ec 62 74 57 d6 fe [ 	]*cibh	%r6,-42,1111\(%r7\)
+.*:	ec 64 74 57 d6 fe [ 	]*cibl	%r6,-42,1111\(%r7\)
 .*:	ec 64 74 57 d6 fe [ 	]*cibl	%r6,-42,1111\(%r7\)
-.*:	ec 65 74 57 d6 fe [ 	]*cibnhe	%r6,-42,1111\(%r7\)
-.*:	ec 66 74 57 d6 fe [ 	]*ciblh	%r6,-42,1111\(%r7\)
-.*:	ec 67 74 57 d6 fe [ 	]*cibne	%r6,-42,1111\(%r7\)
+.*:	ec 66 74 57 d6 fe [ 	]*cibne	%r6,-42,1111\(%r7\)
+.*:	ec 66 74 57 d6 fe [ 	]*cibne	%r6,-42,1111\(%r7\)
+.*:	ec 68 74 57 d6 fe [ 	]*cibe	%r6,-42,1111\(%r7\)
 .*:	ec 68 74 57 d6 fe [ 	]*cibe	%r6,-42,1111\(%r7\)
-.*:	ec 69 74 57 d6 fe [ 	]*cibnlh	%r6,-42,1111\(%r7\)
-.*:	ec 6a 74 57 d6 fe [ 	]*cibhe	%r6,-42,1111\(%r7\)
-.*:	ec 6b 74 57 d6 fe [ 	]*cibnl	%r6,-42,1111\(%r7\)
-.*:	ec 6c 74 57 d6 fe [ 	]*cible	%r6,-42,1111\(%r7\)
-.*:	ec 6d 74 57 d6 fe [ 	]*cibnh	%r6,-42,1111\(%r7\)
-.*:	ec 6a 74 57 d6 fc [ 	]*cgibhe	%r6,-42,1111\(%r7\)
+.*:	ec 6a 74 57 d6 fe [ 	]*cibnl	%r6,-42,1111\(%r7\)
+.*:	ec 6a 74 57 d6 fe [ 	]*cibnl	%r6,-42,1111\(%r7\)
+.*:	ec 6c 74 57 d6 fe [ 	]*cibnh	%r6,-42,1111\(%r7\)
+.*:	ec 6c 74 57 d6 fe [ 	]*cibnh	%r6,-42,1111\(%r7\)
+.*:	ec 6a 74 57 d6 fc [ 	]*cgibnl	%r6,-42,1111\(%r7\)
 .*:	ec 62 74 57 d6 fc [ 	]*cgibh	%r6,-42,1111\(%r7\)
-.*:	ec 63 74 57 d6 fc [ 	]*cgibnle	%r6,-42,1111\(%r7\)
+.*:	ec 62 74 57 d6 fc [ 	]*cgibh	%r6,-42,1111\(%r7\)
+.*:	ec 64 74 57 d6 fc [ 	]*cgibl	%r6,-42,1111\(%r7\)
 .*:	ec 64 74 57 d6 fc [ 	]*cgibl	%r6,-42,1111\(%r7\)
-.*:	ec 65 74 57 d6 fc [ 	]*cgibnhe	%r6,-42,1111\(%r7\)
-.*:	ec 66 74 57 d6 fc [ 	]*cgiblh	%r6,-42,1111\(%r7\)
-.*:	ec 67 74 57 d6 fc [ 	]*cgibne	%r6,-42,1111\(%r7\)
+.*:	ec 66 74 57 d6 fc [ 	]*cgibne	%r6,-42,1111\(%r7\)
+.*:	ec 66 74 57 d6 fc [ 	]*cgibne	%r6,-42,1111\(%r7\)
+.*:	ec 68 74 57 d6 fc [ 	]*cgibe	%r6,-42,1111\(%r7\)
 .*:	ec 68 74 57 d6 fc [ 	]*cgibe	%r6,-42,1111\(%r7\)
-.*:	ec 69 74 57 d6 fc [ 	]*cgibnlh	%r6,-42,1111\(%r7\)
-.*:	ec 6a 74 57 d6 fc [ 	]*cgibhe	%r6,-42,1111\(%r7\)
-.*:	ec 6b 74 57 d6 fc [ 	]*cgibnl	%r6,-42,1111\(%r7\)
-.*:	ec 6c 74 57 d6 fc [ 	]*cgible	%r6,-42,1111\(%r7\)
-.*:	ec 6d 74 57 d6 fc [ 	]*cgibnh	%r6,-42,1111\(%r7\)
+.*:	ec 6a 74 57 d6 fc [ 	]*cgibnl	%r6,-42,1111\(%r7\)
+.*:	ec 6a 74 57 d6 fc [ 	]*cgibnl	%r6,-42,1111\(%r7\)
+.*:	ec 6c 74 57 d6 fc [ 	]*cgibnh	%r6,-42,1111\(%r7\)
+.*:	ec 6c 74 57 d6 fc [ 	]*cgibnh	%r6,-42,1111\(%r7\)
 .*:	ec 6a 00 00 d6 7e [ 	]*cij	%r6,-42,10,1fe <foo\+0x1fe>
 .*:	ec 62 00 00 d6 7e [ 	]*cij	%r6,-42,2,204 <foo\+0x204>
-.*:	ec 63 00 00 d6 7e [ 	]*cij	%r6,-42,3,20a <foo\+0x20a>
+.*:	ec 62 00 00 d6 7e [ 	]*cij	%r6,-42,2,20a <foo\+0x20a>
 .*:	ec 64 00 00 d6 7e [ 	]*cij	%r6,-42,4,210 <foo\+0x210>
-.*:	ec 65 00 00 d6 7e [ 	]*cij	%r6,-42,5,216 <foo\+0x216>
+.*:	ec 64 00 00 d6 7e [ 	]*cij	%r6,-42,4,216 <foo\+0x216>
 .*:	ec 66 00 00 d6 7e [ 	]*cij	%r6,-42,6,21c <foo\+0x21c>
-.*:	ec 67 00 00 d6 7e [ 	]*cij	%r6,-42,7,222 <foo\+0x222>
+.*:	ec 66 00 00 d6 7e [ 	]*cij	%r6,-42,6,222 <foo\+0x222>
 .*:	ec 68 00 00 d6 7e [ 	]*cij	%r6,-42,8,228 <foo\+0x228>
-.*:	ec 69 00 00 d6 7e [ 	]*cij	%r6,-42,9,22e <foo\+0x22e>
+.*:	ec 68 00 00 d6 7e [ 	]*cij	%r6,-42,8,22e <foo\+0x22e>
 .*:	ec 6a 00 00 d6 7e [ 	]*cij	%r6,-42,10,234 <foo\+0x234>
-.*:	ec 6b 00 00 d6 7e [ 	]*cij	%r6,-42,11,23a <foo\+0x23a>
+.*:	ec 6a 00 00 d6 7e [ 	]*cij	%r6,-42,10,23a <foo\+0x23a>
 .*:	ec 6c 00 00 d6 7e [ 	]*cij	%r6,-42,12,240 <foo\+0x240>
-.*:	ec 6d 00 00 d6 7e [ 	]*cij	%r6,-42,13,246 <foo\+0x246>
+.*:	ec 6c 00 00 d6 7e [ 	]*cij	%r6,-42,12,246 <foo\+0x246>
 .*:	ec 6a 00 00 d6 7c [ 	]*cgij	%r6,-42,10,24c <foo\+0x24c>
 .*:	ec 62 00 00 d6 7c [ 	]*cgij	%r6,-42,2,252 <foo\+0x252>
-.*:	ec 63 00 00 d6 7c [ 	]*cgij	%r6,-42,3,258 <foo\+0x258>
+.*:	ec 62 00 00 d6 7c [ 	]*cgij	%r6,-42,2,258 <foo\+0x258>
 .*:	ec 64 00 00 d6 7c [ 	]*cgij	%r6,-42,4,25e <foo\+0x25e>
-.*:	ec 65 00 00 d6 7c [ 	]*cgij	%r6,-42,5,264 <foo\+0x264>
+.*:	ec 64 00 00 d6 7c [ 	]*cgij	%r6,-42,4,264 <foo\+0x264>
 .*:	ec 66 00 00 d6 7c [ 	]*cgij	%r6,-42,6,26a <foo\+0x26a>
-.*:	ec 67 00 00 d6 7c [ 	]*cgij	%r6,-42,7,270 <foo\+0x270>
+.*:	ec 66 00 00 d6 7c [ 	]*cgij	%r6,-42,6,270 <foo\+0x270>
 .*:	ec 68 00 00 d6 7c [ 	]*cgij	%r6,-42,8,276 <foo\+0x276>
-.*:	ec 69 00 00 d6 7c [ 	]*cgij	%r6,-42,9,27c <foo\+0x27c>
+.*:	ec 68 00 00 d6 7c [ 	]*cgij	%r6,-42,8,27c <foo\+0x27c>
 .*:	ec 6a 00 00 d6 7c [ 	]*cgij	%r6,-42,10,282 <foo\+0x282>
-.*:	ec 6b 00 00 d6 7c [ 	]*cgij	%r6,-42,11,288 <foo\+0x288>
+.*:	ec 6a 00 00 d6 7c [ 	]*cgij	%r6,-42,10,288 <foo\+0x288>
 .*:	ec 6c 00 00 d6 7c [ 	]*cgij	%r6,-42,12,28e <foo\+0x28e>
-.*:	ec 6d 00 00 d6 7c [ 	]*cgij	%r6,-42,13,294 <foo\+0x294>
-.*:	b9 72 a0 67 [ 	]*crthe	%r6,%r7
+.*:	ec 6c 00 00 d6 7c [ 	]*cgij	%r6,-42,12,294 <foo\+0x294>
+.*:	b9 72 a0 67 [ 	]*crtnl	%r6,%r7
 .*:	b9 72 20 67 [ 	]*crth	%r6,%r7
-.*:	b9 72 30 67 [ 	]*crtnle	%r6,%r7
+.*:	b9 72 20 67 [ 	]*crth	%r6,%r7
+.*:	b9 72 40 67 [ 	]*crtl	%r6,%r7
 .*:	b9 72 40 67 [ 	]*crtl	%r6,%r7
-.*:	b9 72 50 67 [ 	]*crtnhe	%r6,%r7
-.*:	b9 72 60 67 [ 	]*crtlh	%r6,%r7
-.*:	b9 72 70 67 [ 	]*crtne	%r6,%r7
+.*:	b9 72 60 67 [ 	]*crtne	%r6,%r7
+.*:	b9 72 60 67 [ 	]*crtne	%r6,%r7
+.*:	b9 72 80 67 [ 	]*crte	%r6,%r7
 .*:	b9 72 80 67 [ 	]*crte	%r6,%r7
-.*:	b9 72 90 67 [ 	]*crtnlh	%r6,%r7
-.*:	b9 72 a0 67 [ 	]*crthe	%r6,%r7
-.*:	b9 72 b0 67 [ 	]*crtnl	%r6,%r7
-.*:	b9 72 c0 67 [ 	]*crtle	%r6,%r7
-.*:	b9 72 d0 67 [ 	]*crtnh	%r6,%r7
-.*:	b9 60 a0 67 [ 	]*cgrthe	%r6,%r7
+.*:	b9 72 a0 67 [ 	]*crtnl	%r6,%r7
+.*:	b9 72 a0 67 [ 	]*crtnl	%r6,%r7
+.*:	b9 72 c0 67 [ 	]*crtnh	%r6,%r7
+.*:	b9 72 c0 67 [ 	]*crtnh	%r6,%r7
+.*:	b9 60 a0 67 [ 	]*cgrtnl	%r6,%r7
 .*:	b9 60 20 67 [ 	]*cgrth	%r6,%r7
-.*:	b9 60 30 67 [ 	]*cgrtnle	%r6,%r7
+.*:	b9 60 20 67 [ 	]*cgrth	%r6,%r7
+.*:	b9 60 40 67 [ 	]*cgrtl	%r6,%r7
 .*:	b9 60 40 67 [ 	]*cgrtl	%r6,%r7
-.*:	b9 60 50 67 [ 	]*cgrtnhe	%r6,%r7
-.*:	b9 60 60 67 [ 	]*cgrtlh	%r6,%r7
-.*:	b9 60 70 67 [ 	]*cgrtne	%r6,%r7
+.*:	b9 60 60 67 [ 	]*cgrtne	%r6,%r7
+.*:	b9 60 60 67 [ 	]*cgrtne	%r6,%r7
+.*:	b9 60 80 67 [ 	]*cgrte	%r6,%r7
 .*:	b9 60 80 67 [ 	]*cgrte	%r6,%r7
-.*:	b9 60 90 67 [ 	]*cgrtnlh	%r6,%r7
-.*:	b9 60 a0 67 [ 	]*cgrthe	%r6,%r7
-.*:	b9 60 b0 67 [ 	]*cgrtnl	%r6,%r7
-.*:	b9 60 c0 67 [ 	]*cgrtle	%r6,%r7
-.*:	b9 60 d0 67 [ 	]*cgrtnh	%r6,%r7
-.*:	ec 60 8a d0 a0 72 [ 	]*cithe	%r6,-30000
+.*:	b9 60 a0 67 [ 	]*cgrtnl	%r6,%r7
+.*:	b9 60 a0 67 [ 	]*cgrtnl	%r6,%r7
+.*:	b9 60 c0 67 [ 	]*cgrtnh	%r6,%r7
+.*:	b9 60 c0 67 [ 	]*cgrtnh	%r6,%r7
+.*:	ec 60 8a d0 a0 72 [ 	]*citnl	%r6,-30000
 .*:	ec 60 8a d0 20 72 [ 	]*cith	%r6,-30000
-.*:	ec 60 8a d0 30 72 [ 	]*citnle	%r6,-30000
+.*:	ec 60 8a d0 20 72 [ 	]*cith	%r6,-30000
+.*:	ec 60 8a d0 40 72 [ 	]*citl	%r6,-30000
 .*:	ec 60 8a d0 40 72 [ 	]*citl	%r6,-30000
-.*:	ec 60 8a d0 50 72 [ 	]*citnhe	%r6,-30000
-.*:	ec 60 8a d0 60 72 [ 	]*citlh	%r6,-30000
-.*:	ec 60 8a d0 70 72 [ 	]*citne	%r6,-30000
+.*:	ec 60 8a d0 60 72 [ 	]*citne	%r6,-30000
+.*:	ec 60 8a d0 60 72 [ 	]*citne	%r6,-30000
+.*:	ec 60 8a d0 80 72 [ 	]*cite	%r6,-30000
 .*:	ec 60 8a d0 80 72 [ 	]*cite	%r6,-30000
-.*:	ec 60 8a d0 90 72 [ 	]*citnlh	%r6,-30000
-.*:	ec 60 8a d0 a0 72 [ 	]*cithe	%r6,-30000
-.*:	ec 60 8a d0 b0 72 [ 	]*citnl	%r6,-30000
-.*:	ec 60 8a d0 c0 72 [ 	]*citle	%r6,-30000
-.*:	ec 60 8a d0 d0 72 [ 	]*citnh	%r6,-30000
-.*:	ec 60 8a d0 a0 70 [ 	]*cgithe	%r6,-30000
+.*:	ec 60 8a d0 a0 72 [ 	]*citnl	%r6,-30000
+.*:	ec 60 8a d0 a0 72 [ 	]*citnl	%r6,-30000
+.*:	ec 60 8a d0 c0 72 [ 	]*citnh	%r6,-30000
+.*:	ec 60 8a d0 c0 72 [ 	]*citnh	%r6,-30000
+.*:	ec 60 8a d0 a0 70 [ 	]*cgitnl	%r6,-30000
 .*:	ec 60 8a d0 20 70 [ 	]*cgith	%r6,-30000
-.*:	ec 60 8a d0 30 70 [ 	]*cgitnle	%r6,-30000
+.*:	ec 60 8a d0 20 70 [ 	]*cgith	%r6,-30000
+.*:	ec 60 8a d0 40 70 [ 	]*cgitl	%r6,-30000
 .*:	ec 60 8a d0 40 70 [ 	]*cgitl	%r6,-30000
-.*:	ec 60 8a d0 50 70 [ 	]*cgitnhe	%r6,-30000
-.*:	ec 60 8a d0 60 70 [ 	]*cgitlh	%r6,-30000
-.*:	ec 60 8a d0 70 70 [ 	]*cgitne	%r6,-30000
+.*:	ec 60 8a d0 60 70 [ 	]*cgitne	%r6,-30000
+.*:	ec 60 8a d0 60 70 [ 	]*cgitne	%r6,-30000
+.*:	ec 60 8a d0 80 70 [ 	]*cgite	%r6,-30000
 .*:	ec 60 8a d0 80 70 [ 	]*cgite	%r6,-30000
-.*:	ec 60 8a d0 90 70 [ 	]*cgitnlh	%r6,-30000
-.*:	ec 60 8a d0 a0 70 [ 	]*cgithe	%r6,-30000
-.*:	ec 60 8a d0 b0 70 [ 	]*cgitnl	%r6,-30000
-.*:	ec 60 8a d0 c0 70 [ 	]*cgitle	%r6,-30000
-.*:	ec 60 8a d0 d0 70 [ 	]*cgitnh	%r6,-30000
+.*:	ec 60 8a d0 a0 70 [ 	]*cgitnl	%r6,-30000
+.*:	ec 60 8a d0 a0 70 [ 	]*cgitnl	%r6,-30000
+.*:	ec 60 8a d0 c0 70 [ 	]*cgitnh	%r6,-30000
+.*:	ec 60 8a d0 c0 70 [ 	]*cgitnh	%r6,-30000
 .*:	e3 67 85 b3 01 34 [ 	]*cgh	%r6,5555\(%r7,%r8\)
 .*:	e5 54 64 57 8a d0 [ 	]*chhsi	1111\(%r6\),-30000
 .*:	e5 5c 64 57 8a d0 [ 	]*chsi	1111\(%r6\),-30000
@@ -183,162 +183,162 @@ Disassembly of section .text:
 .*:	c6 6e 00 00 00 00 [ 	]*clgfrl	%r6,3e0 <foo\+0x3e0>
 .*:	c6 67 00 00 00 00 [ 	]*clhrl	%r6,3e6 <foo\+0x3e6>
 .*:	c6 66 00 00 00 00 [ 	]*clghrl	%r6,3ec <foo\+0x3ec>
-.*:	ec 67 84 57 a0 f7 [ 	]*clrbhe	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 a0 f7 [ 	]*clrbnl	%r6,%r7,1111\(%r8\)
 .*:	ec 67 84 57 20 f7 [ 	]*clrbh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 30 f7 [ 	]*clrbnle	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 20 f7 [ 	]*clrbh	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 40 f7 [ 	]*clrbl	%r6,%r7,1111\(%r8\)
 .*:	ec 67 84 57 40 f7 [ 	]*clrbl	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 50 f7 [ 	]*clrbnhe	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 60 f7 [ 	]*clrblh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 70 f7 [ 	]*clrbne	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 60 f7 [ 	]*clrbne	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 60 f7 [ 	]*clrbne	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 80 f7 [ 	]*clrbe	%r6,%r7,1111\(%r8\)
 .*:	ec 67 84 57 80 f7 [ 	]*clrbe	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 90 f7 [ 	]*clrbnlh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 a0 f7 [ 	]*clrbhe	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 b0 f7 [ 	]*clrbnl	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 c0 f7 [ 	]*clrble	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 d0 f7 [ 	]*clrbnh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 a0 e5 [ 	]*clgrbhe	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 a0 f7 [ 	]*clrbnl	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 a0 f7 [ 	]*clrbnl	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 c0 f7 [ 	]*clrbnh	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 c0 f7 [ 	]*clrbnh	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 a0 e5 [ 	]*clgrbnl	%r6,%r7,1111\(%r8\)
 .*:	ec 67 84 57 20 e5 [ 	]*clgrbh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 30 e5 [ 	]*clgrbnle	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 20 e5 [ 	]*clgrbh	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 40 e5 [ 	]*clgrbl	%r6,%r7,1111\(%r8\)
 .*:	ec 67 84 57 40 e5 [ 	]*clgrbl	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 50 e5 [ 	]*clgrbnhe	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 60 e5 [ 	]*clgrblh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 70 e5 [ 	]*clgrbne	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 60 e5 [ 	]*clgrbne	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 60 e5 [ 	]*clgrbne	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 80 e5 [ 	]*clgrbe	%r6,%r7,1111\(%r8\)
 .*:	ec 67 84 57 80 e5 [ 	]*clgrbe	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 90 e5 [ 	]*clgrbnlh	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 a0 e5 [ 	]*clgrbhe	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 b0 e5 [ 	]*clgrbnl	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 c0 e5 [ 	]*clgrble	%r6,%r7,1111\(%r8\)
-.*:	ec 67 84 57 d0 e5 [ 	]*clgrbnh	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 a0 e5 [ 	]*clgrbnl	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 a0 e5 [ 	]*clgrbnl	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 c0 e5 [ 	]*clgrbnh	%r6,%r7,1111\(%r8\)
+.*:	ec 67 84 57 c0 e5 [ 	]*clgrbnh	%r6,%r7,1111\(%r8\)
 .*:	ec 67 00 00 a0 77 [ 	]*clrj	%r6,%r7,10,48e <foo\+0x48e>
 .*:	ec 67 00 00 20 77 [ 	]*clrj	%r6,%r7,2,494 <foo\+0x494>
-.*:	ec 67 00 00 30 77 [ 	]*clrj	%r6,%r7,3,49a <foo\+0x49a>
+.*:	ec 67 00 00 20 77 [ 	]*clrj	%r6,%r7,2,49a <foo\+0x49a>
 .*:	ec 67 00 00 40 77 [ 	]*clrj	%r6,%r7,4,4a0 <foo\+0x4a0>
-.*:	ec 67 00 00 50 77 [ 	]*clrj	%r6,%r7,5,4a6 <foo\+0x4a6>
+.*:	ec 67 00 00 40 77 [ 	]*clrj	%r6,%r7,4,4a6 <foo\+0x4a6>
 .*:	ec 67 00 00 60 77 [ 	]*clrj	%r6,%r7,6,4ac <foo\+0x4ac>
-.*:	ec 67 00 00 70 77 [ 	]*clrj	%r6,%r7,7,4b2 <foo\+0x4b2>
+.*:	ec 67 00 00 60 77 [ 	]*clrj	%r6,%r7,6,4b2 <foo\+0x4b2>
 .*:	ec 67 00 00 80 77 [ 	]*clrj	%r6,%r7,8,4b8 <foo\+0x4b8>
-.*:	ec 67 00 00 90 77 [ 	]*clrj	%r6,%r7,9,4be <foo\+0x4be>
+.*:	ec 67 00 00 80 77 [ 	]*clrj	%r6,%r7,8,4be <foo\+0x4be>
 .*:	ec 67 00 00 a0 77 [ 	]*clrj	%r6,%r7,10,4c4 <foo\+0x4c4>
-.*:	ec 67 00 00 b0 77 [ 	]*clrj	%r6,%r7,11,4ca <foo\+0x4ca>
+.*:	ec 67 00 00 a0 77 [ 	]*clrj	%r6,%r7,10,4ca <foo\+0x4ca>
 .*:	ec 67 00 00 c0 77 [ 	]*clrj	%r6,%r7,12,4d0 <foo\+0x4d0>
-.*:	ec 67 00 00 d0 77 [ 	]*clrj	%r6,%r7,13,4d6 <foo\+0x4d6>
+.*:	ec 67 00 00 c0 77 [ 	]*clrj	%r6,%r7,12,4d6 <foo\+0x4d6>
 .*:	ec 67 00 00 a0 65 [ 	]*clgrj	%r6,%r7,10,4dc <foo\+0x4dc>
 .*:	ec 67 00 00 20 65 [ 	]*clgrj	%r6,%r7,2,4e2 <foo\+0x4e2>
-.*:	ec 67 00 00 30 65 [ 	]*clgrj	%r6,%r7,3,4e8 <foo\+0x4e8>
+.*:	ec 67 00 00 20 65 [ 	]*clgrj	%r6,%r7,2,4e8 <foo\+0x4e8>
 .*:	ec 67 00 00 40 65 [ 	]*clgrj	%r6,%r7,4,4ee <foo\+0x4ee>
-.*:	ec 67 00 00 50 65 [ 	]*clgrj	%r6,%r7,5,4f4 <foo\+0x4f4>
+.*:	ec 67 00 00 40 65 [ 	]*clgrj	%r6,%r7,4,4f4 <foo\+0x4f4>
 .*:	ec 67 00 00 60 65 [ 	]*clgrj	%r6,%r7,6,4fa <foo\+0x4fa>
-.*:	ec 67 00 00 70 65 [ 	]*clgrj	%r6,%r7,7,500 <foo\+0x500>
+.*:	ec 67 00 00 60 65 [ 	]*clgrj	%r6,%r7,6,500 <foo\+0x500>
 .*:	ec 67 00 00 80 65 [ 	]*clgrj	%r6,%r7,8,506 <foo\+0x506>
-.*:	ec 67 00 00 90 65 [ 	]*clgrj	%r6,%r7,9,50c <foo\+0x50c>
+.*:	ec 67 00 00 80 65 [ 	]*clgrj	%r6,%r7,8,50c <foo\+0x50c>
 .*:	ec 67 00 00 a0 65 [ 	]*clgrj	%r6,%r7,10,512 <foo\+0x512>
-.*:	ec 67 00 00 b0 65 [ 	]*clgrj	%r6,%r7,11,518 <foo\+0x518>
+.*:	ec 67 00 00 a0 65 [ 	]*clgrj	%r6,%r7,10,518 <foo\+0x518>
 .*:	ec 67 00 00 c0 65 [ 	]*clgrj	%r6,%r7,12,51e <foo\+0x51e>
-.*:	ec 67 00 00 d0 65 [ 	]*clgrj	%r6,%r7,13,524 <foo\+0x524>
-.*:	ec 6a 74 57 c8 ff [ 	]*clibhe	%r6,200,1111\(%r7\)
+.*:	ec 67 00 00 c0 65 [ 	]*clgrj	%r6,%r7,12,524 <foo\+0x524>
+.*:	ec 6a 74 57 c8 ff [ 	]*clibnl	%r6,200,1111\(%r7\)
 .*:	ec 62 74 57 c8 ff [ 	]*clibh	%r6,200,1111\(%r7\)
-.*:	ec 63 74 57 c8 ff [ 	]*clibnle	%r6,200,1111\(%r7\)
+.*:	ec 62 74 57 c8 ff [ 	]*clibh	%r6,200,1111\(%r7\)
+.*:	ec 64 74 57 c8 ff [ 	]*clibl	%r6,200,1111\(%r7\)
 .*:	ec 64 74 57 c8 ff [ 	]*clibl	%r6,200,1111\(%r7\)
-.*:	ec 65 74 57 c8 ff [ 	]*clibnhe	%r6,200,1111\(%r7\)
-.*:	ec 66 74 57 c8 ff [ 	]*cliblh	%r6,200,1111\(%r7\)
-.*:	ec 67 74 57 c8 ff [ 	]*clibne	%r6,200,1111\(%r7\)
+.*:	ec 66 74 57 c8 ff [ 	]*clibne	%r6,200,1111\(%r7\)
+.*:	ec 66 74 57 c8 ff [ 	]*clibne	%r6,200,1111\(%r7\)
+.*:	ec 68 74 57 c8 ff [ 	]*clibe	%r6,200,1111\(%r7\)
 .*:	ec 68 74 57 c8 ff [ 	]*clibe	%r6,200,1111\(%r7\)
-.*:	ec 69 74 57 c8 ff [ 	]*clibnlh	%r6,200,1111\(%r7\)
-.*:	ec 6a 74 57 c8 ff [ 	]*clibhe	%r6,200,1111\(%r7\)
-.*:	ec 6b 74 57 c8 ff [ 	]*clibnl	%r6,200,1111\(%r7\)
-.*:	ec 6c 74 57 c8 ff [ 	]*clible	%r6,200,1111\(%r7\)
-.*:	ec 6d 74 57 c8 ff [ 	]*clibnh	%r6,200,1111\(%r7\)
-.*:	ec 6a 74 57 c8 fd [ 	]*clgibhe	%r6,200,1111\(%r7\)
+.*:	ec 6a 74 57 c8 ff [ 	]*clibnl	%r6,200,1111\(%r7\)
+.*:	ec 6a 74 57 c8 ff [ 	]*clibnl	%r6,200,1111\(%r7\)
+.*:	ec 6c 74 57 c8 ff [ 	]*clibnh	%r6,200,1111\(%r7\)
+.*:	ec 6c 74 57 c8 ff [ 	]*clibnh	%r6,200,1111\(%r7\)
+.*:	ec 6a 74 57 c8 fd [ 	]*clgibnl	%r6,200,1111\(%r7\)
 .*:	ec 62 74 57 c8 fd [ 	]*clgibh	%r6,200,1111\(%r7\)
-.*:	ec 63 74 57 c8 fd [ 	]*clgibnle	%r6,200,1111\(%r7\)
+.*:	ec 62 74 57 c8 fd [ 	]*clgibh	%r6,200,1111\(%r7\)
+.*:	ec 64 74 57 c8 fd [ 	]*clgibl	%r6,200,1111\(%r7\)
 .*:	ec 64 74 57 c8 fd [ 	]*clgibl	%r6,200,1111\(%r7\)
-.*:	ec 65 74 57 c8 fd [ 	]*clgibnhe	%r6,200,1111\(%r7\)
-.*:	ec 66 74 57 c8 fd [ 	]*clgiblh	%r6,200,1111\(%r7\)
-.*:	ec 67 74 57 c8 fd [ 	]*clgibne	%r6,200,1111\(%r7\)
+.*:	ec 66 74 57 c8 fd [ 	]*clgibne	%r6,200,1111\(%r7\)
+.*:	ec 66 74 57 c8 fd [ 	]*clgibne	%r6,200,1111\(%r7\)
+.*:	ec 68 74 57 c8 fd [ 	]*clgibe	%r6,200,1111\(%r7\)
 .*:	ec 68 74 57 c8 fd [ 	]*clgibe	%r6,200,1111\(%r7\)
-.*:	ec 69 74 57 c8 fd [ 	]*clgibnlh	%r6,200,1111\(%r7\)
-.*:	ec 6a 74 57 c8 fd [ 	]*clgibhe	%r6,200,1111\(%r7\)
-.*:	ec 6b 74 57 c8 fd [ 	]*clgibnl	%r6,200,1111\(%r7\)
-.*:	ec 6c 74 57 c8 fd [ 	]*clgible	%r6,200,1111\(%r7\)
-.*:	ec 6d 74 57 c8 fd [ 	]*clgibnh	%r6,200,1111\(%r7\)
+.*:	ec 6a 74 57 c8 fd [ 	]*clgibnl	%r6,200,1111\(%r7\)
+.*:	ec 6a 74 57 c8 fd [ 	]*clgibnl	%r6,200,1111\(%r7\)
+.*:	ec 6c 74 57 c8 fd [ 	]*clgibnh	%r6,200,1111\(%r7\)
+.*:	ec 6c 74 57 c8 fd [ 	]*clgibnh	%r6,200,1111\(%r7\)
 .*:	ec 6a 00 00 c8 7f [ 	]*clij	%r6,200,10,5c6 <foo\+0x5c6>
 .*:	ec 62 00 00 c8 7f [ 	]*clij	%r6,200,2,5cc <foo\+0x5cc>
-.*:	ec 63 00 00 c8 7f [ 	]*clij	%r6,200,3,5d2 <foo\+0x5d2>
+.*:	ec 62 00 00 c8 7f [ 	]*clij	%r6,200,2,5d2 <foo\+0x5d2>
 .*:	ec 64 00 00 c8 7f [ 	]*clij	%r6,200,4,5d8 <foo\+0x5d8>
-.*:	ec 65 00 00 c8 7f [ 	]*clij	%r6,200,5,5de <foo\+0x5de>
+.*:	ec 64 00 00 c8 7f [ 	]*clij	%r6,200,4,5de <foo\+0x5de>
 .*:	ec 66 00 00 c8 7f [ 	]*clij	%r6,200,6,5e4 <foo\+0x5e4>
-.*:	ec 67 00 00 c8 7f [ 	]*clij	%r6,200,7,5ea <foo\+0x5ea>
+.*:	ec 66 00 00 c8 7f [ 	]*clij	%r6,200,6,5ea <foo\+0x5ea>
 .*:	ec 68 00 00 c8 7f [ 	]*clij	%r6,200,8,5f0 <foo\+0x5f0>
-.*:	ec 69 00 00 c8 7f [ 	]*clij	%r6,200,9,5f6 <foo\+0x5f6>
+.*:	ec 68 00 00 c8 7f [ 	]*clij	%r6,200,8,5f6 <foo\+0x5f6>
 .*:	ec 6a 00 00 c8 7f [ 	]*clij	%r6,200,10,5fc <foo\+0x5fc>
-.*:	ec 6b 00 00 c8 7f [ 	]*clij	%r6,200,11,602 <foo\+0x602>
+.*:	ec 6a 00 00 c8 7f [ 	]*clij	%r6,200,10,602 <foo\+0x602>
 .*:	ec 6c 00 00 c8 7f [ 	]*clij	%r6,200,12,608 <foo\+0x608>
-.*:	ec 6d 00 00 c8 7f [ 	]*clij	%r6,200,13,60e <foo\+0x60e>
+.*:	ec 6c 00 00 c8 7f [ 	]*clij	%r6,200,12,60e <foo\+0x60e>
 .*:	ec 6a 00 00 c8 7d [ 	]*clgij	%r6,200,10,614 <foo\+0x614>
 .*:	ec 62 00 00 c8 7d [ 	]*clgij	%r6,200,2,61a <foo\+0x61a>
-.*:	ec 63 00 00 c8 7d [ 	]*clgij	%r6,200,3,620 <foo\+0x620>
+.*:	ec 62 00 00 c8 7d [ 	]*clgij	%r6,200,2,620 <foo\+0x620>
 .*:	ec 64 00 00 c8 7d [ 	]*clgij	%r6,200,4,626 <foo\+0x626>
-.*:	ec 65 00 00 c8 7d [ 	]*clgij	%r6,200,5,62c <foo\+0x62c>
+.*:	ec 64 00 00 c8 7d [ 	]*clgij	%r6,200,4,62c <foo\+0x62c>
 .*:	ec 66 00 00 c8 7d [ 	]*clgij	%r6,200,6,632 <foo\+0x632>
-.*:	ec 67 00 00 c8 7d [ 	]*clgij	%r6,200,7,638 <foo\+0x638>
+.*:	ec 66 00 00 c8 7d [ 	]*clgij	%r6,200,6,638 <foo\+0x638>
 .*:	ec 68 00 00 c8 7d [ 	]*clgij	%r6,200,8,63e <foo\+0x63e>
-.*:	ec 69 00 00 c8 7d [ 	]*clgij	%r6,200,9,644 <foo\+0x644>
+.*:	ec 68 00 00 c8 7d [ 	]*clgij	%r6,200,8,644 <foo\+0x644>
 .*:	ec 6a 00 00 c8 7d [ 	]*clgij	%r6,200,10,64a <foo\+0x64a>
-.*:	ec 6b 00 00 c8 7d [ 	]*clgij	%r6,200,11,650 <foo\+0x650>
+.*:	ec 6a 00 00 c8 7d [ 	]*clgij	%r6,200,10,650 <foo\+0x650>
 .*:	ec 6c 00 00 c8 7d [ 	]*clgij	%r6,200,12,656 <foo\+0x656>
-.*:	ec 6d 00 00 c8 7d [ 	]*clgij	%r6,200,13,65c <foo\+0x65c>
-.*:	b9 73 a0 67 [ 	]*clrthe	%r6,%r7
+.*:	ec 6c 00 00 c8 7d [ 	]*clgij	%r6,200,12,65c <foo\+0x65c>
+.*:	b9 73 a0 67 [ 	]*clrtnl	%r6,%r7
 .*:	b9 73 20 67 [ 	]*clrth	%r6,%r7
-.*:	b9 73 30 67 [ 	]*clrtnle	%r6,%r7
+.*:	b9 73 20 67 [ 	]*clrth	%r6,%r7
+.*:	b9 73 40 67 [ 	]*clrtl	%r6,%r7
 .*:	b9 73 40 67 [ 	]*clrtl	%r6,%r7
-.*:	b9 73 50 67 [ 	]*clrtnhe	%r6,%r7
-.*:	b9 73 60 67 [ 	]*clrtlh	%r6,%r7
-.*:	b9 73 70 67 [ 	]*clrtne	%r6,%r7
+.*:	b9 73 60 67 [ 	]*clrtne	%r6,%r7
+.*:	b9 73 60 67 [ 	]*clrtne	%r6,%r7
+.*:	b9 73 80 67 [ 	]*clrte	%r6,%r7
 .*:	b9 73 80 67 [ 	]*clrte	%r6,%r7
-.*:	b9 73 90 67 [ 	]*clrtnlh	%r6,%r7
-.*:	b9 73 a0 67 [ 	]*clrthe	%r6,%r7
-.*:	b9 73 b0 67 [ 	]*clrtnl	%r6,%r7
-.*:	b9 73 c0 67 [ 	]*clrtle	%r6,%r7
-.*:	b9 73 d0 67 [ 	]*clrtnh	%r6,%r7
-.*:	b9 61 a0 67 [ 	]*clgrthe	%r6,%r7
+.*:	b9 73 a0 67 [ 	]*clrtnl	%r6,%r7
+.*:	b9 73 a0 67 [ 	]*clrtnl	%r6,%r7
+.*:	b9 73 c0 67 [ 	]*clrtnh	%r6,%r7
+.*:	b9 73 c0 67 [ 	]*clrtnh	%r6,%r7
+.*:	b9 61 a0 67 [ 	]*clgrtnl	%r6,%r7
 .*:	b9 61 20 67 [ 	]*clgrth	%r6,%r7
-.*:	b9 61 30 67 [ 	]*clgrtnle	%r6,%r7
+.*:	b9 61 20 67 [ 	]*clgrth	%r6,%r7
+.*:	b9 61 40 67 [ 	]*clgrtl	%r6,%r7
 .*:	b9 61 40 67 [ 	]*clgrtl	%r6,%r7
-.*:	b9 61 50 67 [ 	]*clgrtnhe	%r6,%r7
-.*:	b9 61 60 67 [ 	]*clgrtlh	%r6,%r7
-.*:	b9 61 70 67 [ 	]*clgrtne	%r6,%r7
+.*:	b9 61 60 67 [ 	]*clgrtne	%r6,%r7
+.*:	b9 61 60 67 [ 	]*clgrtne	%r6,%r7
+.*:	b9 61 80 67 [ 	]*clgrte	%r6,%r7
 .*:	b9 61 80 67 [ 	]*clgrte	%r6,%r7
-.*:	b9 61 90 67 [ 	]*clgrtnlh	%r6,%r7
-.*:	b9 61 a0 67 [ 	]*clgrthe	%r6,%r7
-.*:	b9 61 b0 67 [ 	]*clgrtnl	%r6,%r7
-.*:	b9 61 c0 67 [ 	]*clgrtle	%r6,%r7
-.*:	b9 61 d0 67 [ 	]*clgrtnh	%r6,%r7
-.*:	ec 60 75 30 a0 73 [ 	]*clfithe	%r6,30000
+.*:	b9 61 a0 67 [ 	]*clgrtnl	%r6,%r7
+.*:	b9 61 a0 67 [ 	]*clgrtnl	%r6,%r7
+.*:	b9 61 c0 67 [ 	]*clgrtnh	%r6,%r7
+.*:	b9 61 c0 67 [ 	]*clgrtnh	%r6,%r7
+.*:	ec 60 75 30 a0 73 [ 	]*clfitnl	%r6,30000
 .*:	ec 60 75 30 20 73 [ 	]*clfith	%r6,30000
-.*:	ec 60 75 30 30 73 [ 	]*clfitnle	%r6,30000
+.*:	ec 60 75 30 20 73 [ 	]*clfith	%r6,30000
+.*:	ec 60 75 30 40 73 [ 	]*clfitl	%r6,30000
 .*:	ec 60 75 30 40 73 [ 	]*clfitl	%r6,30000
-.*:	ec 60 75 30 50 73 [ 	]*clfitnhe	%r6,30000
-.*:	ec 60 75 30 60 73 [ 	]*clfitlh	%r6,30000
-.*:	ec 60 75 30 70 73 [ 	]*clfitne	%r6,30000
+.*:	ec 60 75 30 60 73 [ 	]*clfitne	%r6,30000
+.*:	ec 60 75 30 60 73 [ 	]*clfitne	%r6,30000
+.*:	ec 60 75 30 80 73 [ 	]*clfite	%r6,30000
 .*:	ec 60 75 30 80 73 [ 	]*clfite	%r6,30000
-.*:	ec 60 75 30 90 73 [ 	]*clfitnlh	%r6,30000
-.*:	ec 60 75 30 a0 73 [ 	]*clfithe	%r6,30000
-.*:	ec 60 75 30 b0 73 [ 	]*clfitnl	%r6,30000
-.*:	ec 60 75 30 c0 73 [ 	]*clfitle	%r6,30000
-.*:	ec 60 75 30 d0 73 [ 	]*clfitnh	%r6,30000
-.*:	ec 60 75 30 a0 71 [ 	]*clgithe	%r6,30000
+.*:	ec 60 75 30 a0 73 [ 	]*clfitnl	%r6,30000
+.*:	ec 60 75 30 a0 73 [ 	]*clfitnl	%r6,30000
+.*:	ec 60 75 30 c0 73 [ 	]*clfitnh	%r6,30000
+.*:	ec 60 75 30 c0 73 [ 	]*clfitnh	%r6,30000
+.*:	ec 60 75 30 a0 71 [ 	]*clgitnl	%r6,30000
 .*:	ec 60 75 30 20 71 [ 	]*clgith	%r6,30000
-.*:	ec 60 75 30 30 71 [ 	]*clgitnle	%r6,30000
+.*:	ec 60 75 30 20 71 [ 	]*clgith	%r6,30000
+.*:	ec 60 75 30 40 71 [ 	]*clgitl	%r6,30000
 .*:	ec 60 75 30 40 71 [ 	]*clgitl	%r6,30000
-.*:	ec 60 75 30 50 71 [ 	]*clgitnhe	%r6,30000
-.*:	ec 60 75 30 60 71 [ 	]*clgitlh	%r6,30000
-.*:	ec 60 75 30 70 71 [ 	]*clgitne	%r6,30000
+.*:	ec 60 75 30 60 71 [ 	]*clgitne	%r6,30000
+.*:	ec 60 75 30 60 71 [ 	]*clgitne	%r6,30000
+.*:	ec 60 75 30 80 71 [ 	]*clgite	%r6,30000
 .*:	ec 60 75 30 80 71 [ 	]*clgite	%r6,30000
-.*:	ec 60 75 30 90 71 [ 	]*clgitnlh	%r6,30000
-.*:	ec 60 75 30 a0 71 [ 	]*clgithe	%r6,30000
-.*:	ec 60 75 30 b0 71 [ 	]*clgitnl	%r6,30000
-.*:	ec 60 75 30 c0 71 [ 	]*clgitle	%r6,30000
-.*:	ec 60 75 30 d0 71 [ 	]*clgitnh	%r6,30000
+.*:	ec 60 75 30 a0 71 [ 	]*clgitnl	%r6,30000
+.*:	ec 60 75 30 a0 71 [ 	]*clgitnl	%r6,30000
+.*:	ec 60 75 30 c0 71 [ 	]*clgitnh	%r6,30000
+.*:	ec 60 75 30 c0 71 [ 	]*clgitnh	%r6,30000
 .*:	eb 67 84 57 00 4c [ 	]*ecag	%r6,%r7,1111\(%r8\)
 .*:	c4 6d 00 00 00 00 [ 	]*lrl	%r6,76c <foo\+0x76c>
 .*:	c4 68 00 00 00 00 [ 	]*lgrl	%r6,772 <foo\+0x772>
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 5eb98b8..f90038d 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,13 @@
+2008-04-10  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+	* s390-mkopc.c (s390_cond_ext_format): Add back the mnemonic
+	extensions for conditional jumps (o, p, m, nz, z, nm, np, no).
+	(s390_crb_extensions): New extensions table.
+	(insertExpandedMnemonic): Handle '$' tag.
+	* s390-opc.txt: Remove conditional jump variants which can now
+	be expanded automatically.
+	Replace '*' tag with '$' in the compare and branch instructions.
+
 2008-04-07  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* i386-dis.c (PREFIX_VEX_38XX): Add a tab.
diff --git a/opcodes/s390-mkopc.c b/opcodes/s390-mkopc.c
index 24951db..7274bdc 100644
--- a/opcodes/s390-mkopc.c
+++ b/opcodes/s390-mkopc.c
@@ -1,5 +1,5 @@
 /* s390-mkopc.c -- Generates opcode table out of s390-opc.txt
-   Copyright 2000, 2001, 2003, 2007 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2003, 2007, 2008 Free Software Foundation, Inc.
    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
 
    This file is part of the GNU opcodes library.
@@ -122,22 +122,48 @@ struct s390_cond_ext_format
   char extension[4];
 };
 
-/* The mnemonic extensions for conditional branches used to replace
+/* The mnemonic extensions for conditional jumps used to replace
    the '*' tag.  */
-#define NUM_COND_EXTENSIONS 12
+#define NUM_COND_EXTENSIONS 20
 const struct s390_cond_ext_format s390_cond_extensions[NUM_COND_EXTENSIONS] =
-{ { '2', "h" },    /* jump on A high */
+{ { '1', "o" },    /* jump on overflow / if ones */
+  { '2', "h" },    /* jump on A high */
+  { '2', "p" },    /* jump on plus */
   { '3', "nle" },  /* jump on not low or equal */
   { '4', "l" },    /* jump on A low */
+  { '4', "m" },    /* jump on minus / if mixed */
   { '5', "nhe" },  /* jump on not high or equal */
   { '6', "lh" },   /* jump on low or high */
   { '7', "ne" },   /* jump on A not equal B */
+  { '7', "nz" },   /* jump on not zero / if not zeros */
   { '8', "e" },    /* jump on A equal B */
+  { '8', "z" },    /* jump on zero / if zeros */
   { '9', "nlh" },  /* jump on not low or high */
   { 'a', "he" },   /* jump on high or equal */
   { 'b', "nl" },   /* jump on A not low */
+  { 'b', "nm" },   /* jump on not minus / if not mixed */
   { 'c', "le" },   /* jump on low or equal */
   { 'd', "nh" },   /* jump on A not high */
+  { 'd', "np" },   /* jump on not plus */
+  { 'e', "no" },   /* jump on not overflow / if not ones */
+};
+
+/* The mnemonic extensions for conditional branches used to replace
+   the '$' tag.  */
+#define NUM_CRB_EXTENSIONS 12
+const struct s390_cond_ext_format s390_crb_extensions[NUM_CRB_EXTENSIONS] =
+{ { '2', "h" },    /* jump on A high */
+  { '2', "nle" },  /* jump on not low or equal */
+  { '4', "l" },    /* jump on A low */
+  { '4', "nhe" },  /* jump on not high or equal */
+  { '6', "ne" },   /* jump on A not equal B */
+  { '6', "lh" },   /* jump on low or high */
+  { '8', "e" },    /* jump on A equal B */
+  { '8', "nlh" },  /* jump on not low or high */
+  { 'a', "nl" },   /* jump on A not low */
+  { 'a', "he" },   /* jump on high or equal */
+  { 'c', "nh" },   /* jump on A not high */
+  { 'c', "le" },   /* jump on low or equal */
 };
 
 /* As with insertOpcode instructions are added to the sorted opcode
@@ -156,8 +182,10 @@ insertExpandedMnemonic (char *opcode, char *mnemonic, char *format,
   char number[5];
   int mask_start, i = 0, tag_found = 0, reading_number = 0;
   int number_p = 0, suffix_p = 0, prefix_p = 0;
+  const struct s390_cond_ext_format *ext_table;
+  int ext_table_length;
 
-  if (!(tag = strchr (mnemonic, '*')))
+  if (!(tag = strpbrk (mnemonic, "*$")))
     {
       insertOpcode (opcode, mnemonic, format, min_cpu, mode_bits);
       return;
@@ -217,13 +245,26 @@ insertExpandedMnemonic (char *opcode, char *mnemonic, char *format,
 
   mask_start >>= 2;
 
-  for (i = 0; i < NUM_COND_EXTENSIONS; i++)
+  switch (*tag)
+    {
+    case '*':
+      ext_table = s390_cond_extensions;
+      ext_table_length = NUM_COND_EXTENSIONS;
+      break;
+    case '$':
+      ext_table = s390_crb_extensions;
+      ext_table_length = NUM_CRB_EXTENSIONS;
+      break;
+    default: fprintf (stderr, "Unknown tag char: %c\n", *tag);
+    }
+
+  for (i = 0; i < ext_table_length; i++)
     {
       char new_mnemonic[15];
 
       strcpy (new_mnemonic, prefix);
-      opcode[mask_start] = s390_cond_extensions[i].nibble;
-      strcat (new_mnemonic, s390_cond_extensions[i].extension);
+      opcode[mask_start] = ext_table[i].nibble;
+      strcat (new_mnemonic, ext_table[i].extension);
       strcat (new_mnemonic, suffix);
       insertOpcode (opcode, new_mnemonic, format, min_cpu, mode_bits);
     }
diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
index 4b78f24..7f6aee2 100644
--- a/opcodes/s390-opc.txt
+++ b/opcodes/s390-opc.txt
@@ -262,35 +262,11 @@ a700 tmh RI_RU "test under mask high" g5 esa,zarch
 a701 tml RI_RU "test under mask low" g5 esa,zarch
 0700 nopr RR_0R "no operation" g5 esa,zarch
 0700 b*8r RR_0R "conditional branch" g5 esa,zarch
-0710 bor RR_0R "branch on overflow / if ones" g5 esa,zarch
-0720 bpr RR_0R "branch on plus" g5 esa,zarch
-0740 bmr RR_0R "branch on minus / if mixed" g5 esa,zarch
-0770 bnzr RR_0R "branch on not zero / if not zeros" g5 esa,zarch
-0780 bzr RR_0R "branch on zero / if zeros" g5 esa,zarch
-07b0 bnmr RR_0R "branch on not minus / if not mixed" g5 esa,zarch
-07d0 bnpr RR_0R "branch on not plus" g5 esa,zarch
-07e0 bnor RR_0R "branch on not overflow / if not ones" g5 esa,zarch
 07f0 br RR_0R "unconditional branch" g5 esa,zarch
 4700 nop RX_0RRD "no operation" g5 esa,zarch
 4700 b*8 RX_0RRD "conditional branch" g5 esa,zarch
-4710 bo RX_0RRD "branch on overflow / if ones" g5 esa,zarch
-4720 bp RX_0RRD "branch on plus" g5 esa,zarch
-4740 bm RX_0RRD "branch on minus / if mixed" g5 esa,zarch
-4770 bnz RX_0RRD "branch on not zero / if not zeros" g5 esa,zarch
-4780 bz RX_0RRD "branch on zero / if zeros" g5 esa,zarch
-47b0 bnm RX_0RRD "branch on not minus / if not mixed" g5 esa,zarch
-47d0 bnp RX_0RRD "branch on not plus" g5 esa,zarch
-47e0 bno RX_0RRD "branch on not overflow / if not ones" g5 esa,zarch
 47f0 b RX_0RRD "unconditional branch" g5 esa,zarch
 a704 j*8 RI_0P "conditional jump" g5 esa,zarch
-a714 jo RI_0P "jump on overflow / if ones" g5 esa,zarch
-a724 jp RI_0P "jump on plus" g5 esa,zarch
-a744 jm RI_0P "jump on minus / if mixed" g5 esa,zarch
-a774 jnz RI_0P "jump on not zero / if not zeros" g5 esa,zarch
-a784 jz RI_0P "jump on zero / if zeros" g5 esa,zarch
-a7b4 jnm RI_0P "jump on not minus / if not mixed" g5 esa,zarch
-a7d4 jnp RI_0P "jump on not plus" g5 esa,zarch
-a7e4 jno RI_0P "jump on not overflow / if not ones" g5 esa,zarch
 a7f4 j RI_0P "unconditional jump" g5 esa,zarch
 b34a axbr RRE_FF "add extended bfp" g5 esa,zarch
 b31a adbr RRE_FF "add long bfp" g5 esa,zarch
@@ -487,14 +463,6 @@ a702 tmhh RI_RU "test under mask high high" z900 zarch
 a703 tmhl RI_RU "test under mask high low" z900 zarch
 c004 brcl RIL_UP "branch relative on condition long" z900 esa,zarch
 c004 jg*8 RIL_0P "conditional jump long" z900 esa,zarch
-c014 jgo RIL_0P "jump long on overflow / if ones" z900 esa,zarch
-c024 jgp RIL_0P "jump long on plus" z900 esa,zarch
-c044 jgm RIL_0P "jump long on minus / if mixed" z900 esa,zarch
-c074 jgnz RIL_0P "jump long on not zero / if not zeros" z900 esa,zarch
-c084 jgz RIL_0P "jump long on zero / if zeros" z900 esa,zarch
-c0b4 jgnm RIL_0P "jump long on not minus / if not mixed" z900 esa,zarch
-c0d4 jgnp RIL_0P "jump long on not plus" z900 esa,zarch
-c0e4 jgno RIL_0P "jump long on not overflow / if not ones" z900 esa,zarch
 c0f4 jg RIL_0P "unconditional jump long" z900 esa,zarch
 c005 brasl RIL_RP "branch relative and save long" z900 esa,zarch
 a707 brctg RI_RP "branch relative on count 64" z900 zarch
@@ -884,6 +852,7 @@ ed0000000059 tdgxt RXE_FRRD "test data group extended dfp" z9-ec zarch
 010a pfpo E "perform floating point operation" z9-ec zarch
 c801 ectg SSF_RRDRD "extract cpu time" z9-ec zarch
 c802 csst SSF_RRDRD "compare and swap and store" z9-ec zarch
+# The new instructions of the System z10 Enterprise Class
 eb000000006a asi SIY_IRD "add immediate (32<8)" z10 zarch
 eb000000007a agsi SIY_IRD "add immediate (64<8)" z10 zarch
 eb000000006e alsi SIY_IRD "add logical with signed immediate (32<8)" z10 zarch
@@ -891,29 +860,29 @@ eb000000007e algsi SIY_IRD "add logical with signed immediate (64<8)" z10 zarch
 c60d crl RIL_RP "compare relative long (32)" z10 zarch
 c608 cgrl RIL_RP "compare relative long (64)" z10 zarch
 c60c cgfrl RIL_RP "compare relative long (64<32)" z10 zarch
-ec00000000f6 crb*32 RRS_RRRD0 "compare and branch (32)" z10 zarch
+ec00000000f6 crb$32 RRS_RRRD0 "compare and branch (32)" z10 zarch
 ec00000000f6 crb RRS_RRRDU "compare and branch (32)" z10 zarch
-ec00000000e4 cgrb*32 RRS_RRRD0 "compare and branch (64)" z10 zarch
+ec00000000e4 cgrb$32 RRS_RRRD0 "compare and branch (64)" z10 zarch
 ec00000000e4 cgrb RRS_RRRDU "compare and branch (64)" z10 zarch
-ec0000000076 crj*32 RIE_RRP "compare and branch relative (32)" z10 zarch
+ec0000000076 crj$32 RIE_RRP "compare and branch relative (32)" z10 zarch
 ec0000000076 crj RIE_RRPU "compare and branch relative (32)" z10 zarch
-ec0000000064 cgrj*32 RIE_RRP0 "compare and branch relative (64)" z10 zarch
+ec0000000064 cgrj$32 RIE_RRP0 "compare and branch relative (64)" z10 zarch
 ec0000000064 cgrj RIE_RRPU "compare and branch relative (64)" z10 zarch
-ec00000000fe cib*12 RIS_R0RDI "compare immediate and branch (32<8)" z10 zarch
+ec00000000fe cib$12 RIS_R0RDI "compare immediate and branch (32<8)" z10 zarch
 ec00000000fe cib RIS_RURDI "compare immediate and branch (32<8)" z10 zarch
-ec00000000fc cgib*12 RIS_R0RDI "compare immediate and branch (64<8)" z10 zarch
+ec00000000fc cgib$12 RIS_R0RDI "compare immediate and branch (64<8)" z10 zarch
 ec00000000fc cgib RIS_RURDI "compare immediate and branch (64<8)" z10 zarch
-ec000000007e cij*12 RIE_R0PI "compare immediate and branch relative (32<8)" z10 zarch
+ec000000007e cij$12 RIE_R0PI "compare immediate and branch relative (32<8)" z10 zarch
 ec000000007e cij RIE_RUPI "compare immediate and branch relative (32<8)" z10 zarch
-ec000000007c cgij*12 RIE_R0PI "compare immediate and branch relative (64<8)" z10 zarch
+ec000000007c cgij$12 RIE_R0PI "compare immediate and branch relative (64<8)" z10 zarch
 ec000000007c cgij RIE_RUPI "compare immediate and branch relative (64<8)" z10 zarch
-b97200000000 crt*16 RRF_00RR "compare and trap" z10 zarch
+b97200000000 crt$16 RRF_00RR "compare and trap" z10 zarch
 b972 crt RRF_U0RR "compare and trap" z10 zarch
-b96000000000 cgrt*16 RRF_00RR "compare and trap 64" z10 zarch
+b96000000000 cgrt$16 RRF_00RR "compare and trap 64" z10 zarch
 b960 cgrt RRF_U0RR "compare and trap 64" z10 zarch
-ec0000000072 cit*32 RIE_R0I0 "compare immediate and trap (32<16)" z10 zarch
+ec0000000072 cit$32 RIE_R0I0 "compare immediate and trap (32<16)" z10 zarch
 ec0000000072 cit RIE_R0IU "compare immediate and trap (32<16)" z10 zarch
-ec0000000070 cgit*32 RIE_R0I0 "compare immediate and trap (64<16)" z10 zarch
+ec0000000070 cgit$32 RIE_R0I0 "compare immediate and trap (64<16)" z10 zarch
 ec0000000070 cgit RIE_R0IU "compare immediate and trap (64<16)" z10 zarch
 e30000000034 cgh RXY_RRRD "compare halfword (64<16)" z10 zarch
 e554 chhsi SIL_RDI "compare halfword immediate (16<16)" z10 zarch
@@ -929,29 +898,29 @@ c60a clgrl RIL_RP "compare logical relative long (64)" z10 zarch
 c60e clgfrl RIL_RP "compare logical relative long (64<32)" z10 zarch
 c607 clhrl RIL_RP "compare logical relative long (32<16)" z10 zarch
 c606 clghrl RIL_RP "compare logical relative long (64<16)" z10 zarch
-ec00000000f7 clrb*32 RRS_RRRD0 "compare logical and branch (32)" z10 zarch
+ec00000000f7 clrb$32 RRS_RRRD0 "compare logical and branch (32)" z10 zarch
 ec00000000f7 clrb RRS_RRRDU "compare logical and branch (32)" z10 zarch
-ec00000000e5 clgrb*32 RRS_RRRD0 "compare logical and branch (64)" z10 zarch
+ec00000000e5 clgrb$32 RRS_RRRD0 "compare logical and branch (64)" z10 zarch
 ec00000000e5 clgrb RRS_RRRDU "compare logical and branch (64)" z10 zarch
-ec0000000077 clrj*32 RIE_RRP "compare logical and branch relative (32)" z10 zarch
+ec0000000077 clrj$32 RIE_RRP "compare logical and branch relative (32)" z10 zarch
 ec0000000077 clrj RIE_RRPU "compare logical and branch relative (32)" z10 zarch
-ec0000000065 clgrj*32 RIE_RRP "compare logical and branch relative (64)" z10 zarch
+ec0000000065 clgrj$32 RIE_RRP "compare logical and branch relative (64)" z10 zarch
 ec0000000065 clgrj RIE_RRPU "compare logical and branch relative (64)" z10 zarch
-ec00000000ff clib*12 RIS_R0RDU "compare logical immediate and branch (32<8)" z10 zarch
+ec00000000ff clib$12 RIS_R0RDU "compare logical immediate and branch (32<8)" z10 zarch
 ec00000000ff clib RIS_RURDU "compare logical immediate and branch (32<8)" z10 zarch
-ec00000000fd clgib*12 RIS_R0RDU "compare logical immediate and branch (64<8)" z10 zarch
+ec00000000fd clgib$12 RIS_R0RDU "compare logical immediate and branch (64<8)" z10 zarch
 ec00000000fd clgib RIS_RURDU "compare logical immediate and branch (64<8)" z10 zarch
-ec000000007f clij*12 RIE_R0PU "compare logical immediate and branch relative (32<8)" z10 zarch
+ec000000007f clij$12 RIE_R0PU "compare logical immediate and branch relative (32<8)" z10 zarch
 ec000000007f clij RIE_RUPU "compare logical immediate and branch relative (32<8)" z10 zarch
-ec000000007d clgij*12 RIE_R0PU "compare logical immediate and branch relative (64<8)" z10 zarch
+ec000000007d clgij$12 RIE_R0PU "compare logical immediate and branch relative (64<8)" z10 zarch
 ec000000007d clgij RIE_RUPU "compare logical immediate and branch relative (64<8)" z10 zarch
-b97300000000 clrt*16 RRF_00RR "compare logical and trap (32)" z10 zarch
+b97300000000 clrt$16 RRF_00RR "compare logical and trap (32)" z10 zarch
 b973 clrt RRF_U0RR "compare logical and trap (32)" z10 zarch
-b96100000000 clgrt*16 RRF_00RR "compare logical and trap (64)" z10 zarch
+b96100000000 clgrt$16 RRF_00RR "compare logical and trap (64)" z10 zarch
 b961 clgrt RRF_U0RR "compare logical and trap (64)" z10 zarch
-ec0000000073 clfit*32 RIE_R0U0 "compare logical and trap (32<16)" z10 zarch
+ec0000000073 clfit$32 RIE_R0U0 "compare logical and trap (32<16)" z10 zarch
 ec0000000073 clfit RIE_R0UU "compare logical and trap (32<16)" z10 zarch
-ec0000000071 clgit*32 RIE_R0U0 "compare logical and trap (64<16)" z10 zarch
+ec0000000071 clgit$32 RIE_R0U0 "compare logical and trap (64<16)" z10 zarch
 ec0000000071 clgit RIE_R0UU "compare logical and trap (64<16)" z10 zarch
 eb000000004c ecag RSY_RRRD "extract cache attribute" z10 zarch
 c40d lrl RIL_RP "load relative long (32)" z10 zarch