2011-05-24 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>

	* config/tc-s390.c (md_gather_operands): Emit an error for odd
	numbered registers used as register pair operand.

2011-05-24  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* opcode/s390.h: Add S390_OPCODE_REG_EVEN flag.

2011-05-24  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* s390-opc.c: Add new instruction types marking register pair
	operands.
	* s390-opc.txt: Match instructions having register pair operands
	to the new instruction types.

2011-05-24  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* gas/s390/esa-g5.d: Fix register pair operands.
	* gas/s390/esa-g5.s: Likewise.
	* gas/s390/esa-z9-109.d: Likewise.
	* gas/s390/esa-z9-109.s: Likewise.
	* gas/s390/zarch-z196.d: Likewise.
	* gas/s390/zarch-z196.s: Likewise.
	* gas/s390/zarch-z9-109.d: Likewise.
	* gas/s390/zarch-z9-109.s: Likewise.
	* gas/s390/zarch-z900.d: Likewise.
	* gas/s390/zarch-z900.s: Likewise.
	* gas/s390/zarch-z990.d: Likewise.
	* gas/s390/zarch-z990.s: Likewise.

15 files changed, 197 insertions, 174 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d6cf551..851688d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-24  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* config/tc-s390.c (md_gather_operands): Emit an error for odd
+	numbered registers used as register pair operand.
+
 2011-05-23  Nick Clifton  <nickc@redhat.com>
 
 	* config/tc-v850.h (TC_FX_SIZE_SLACK): Define.
diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 8fc66d8..36d5974 100644
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -1267,6 +1267,9 @@ md_gather_operands (char *str,
 		  && ex.X_add_number == 0
 		  && warn_areg_zero)
 		as_warn (_("base register specified but zero"));
+	      if ((operand->flags & S390_OPERAND_REG_EVEN)
+		  && (ex.X_add_number & 1))
+		as_fatal (_("odd numbered register specified as register pair"));
 	      s390_insert_operand (insn, operand, ex.X_add_number, NULL, 0);
 	    }
 	}
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 949e2f1..55ccb35 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+2011-05-24  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* gas/s390/esa-g5.d: Fix register pair operands.
+	* gas/s390/esa-g5.s: Likewise.
+	* gas/s390/esa-z9-109.d: Likewise.
+	* gas/s390/esa-z9-109.s: Likewise.
+	* gas/s390/zarch-z196.d: Likewise.
+	* gas/s390/zarch-z196.s: Likewise.
+	* gas/s390/zarch-z9-109.d: Likewise.
+	* gas/s390/zarch-z9-109.s: Likewise.
+	* gas/s390/zarch-z900.d: Likewise.
+	* gas/s390/zarch-z900.s: Likewise.
+	* gas/s390/zarch-z990.d: Likewise.
+	* gas/s390/zarch-z990.s: Likewise.
+
 2011-05-20  Bernd Schmidt  <bernds@codesourcery.com>
 
 	* gas/tic6x/pcr-relocs.d: New test.
diff --git a/gas/testsuite/gas/s390/esa-g5.d b/gas/testsuite/gas/s390/esa-g5.d
index 0e0984a..3007c7d 100644
--- a/gas/testsuite/gas/s390/esa-g5.d
+++ b/gas/testsuite/gas/s390/esa-g5.d
@@ -25,8 +25,8 @@ Disassembly of section .text:
 .*:	3e 69 [	 ]*aur	%f6,%f9
 .*:	6e 65 af ff [	 ]*aw	%f6,4095\(%r5,%r10\)
 .*:	2e 69 [	 ]*awr	%f6,%f9
-.*:	b3 4a 00 69 [	 ]*axbr	%f6,%f9
-.*:	36 69 [	 ]*axr	%f6,%f9
+.*:	b3 4a 00 68 [	 ]*axbr	%f6,%f8
+.*:	36 68 [	 ]*axr	%f6,%f8
 .*:	47 f5 af ff [	 ]*b	4095\(%r5,%r10\)
 .*:	b2 40 00 69 [	 ]*bakr	%r6,%r9
 .*:	45 65 af ff [	 ]*bal	%r6,4095\(%r5,%r10\)
@@ -96,7 +96,7 @@ Disassembly of section .text:
 .*:	b3 95 00 69 [	 ]*cdfbr	%f6,%r9
 .*:	b3 b5 00 69 [	 ]*cdfr	%f6,%r9
 .*:	29 69 [	 ]*cdr	%f6,%f9
-.*:	bb 69 5f ff [	 ]*cds	%r6,%r9,4095\(%r5\)
+.*:	bb 68 5f ff [	 ]*cds	%r6,%r8,4095\(%r5\)
 .*:	79 65 af ff [	 ]*ce	%f6,4095\(%r5,%r10\)
 .*:	ed 65 af ff 00 09 [	 ]*ceb	%f6,4095\(%r5,%r10\)
 .*:	b3 09 00 69 [	 ]*cebr	%f6,%f9
@@ -106,10 +106,10 @@ Disassembly of section .text:
 .*:	b2 1a 5f ff [	 ]*cfc	4095\(%r5\)
 .*:	b3 99 50 69 [	 ]*cfdbr	%r6,5,%f9
 .*:	b3 98 50 69 [	 ]*cfebr	%r6,5,%f9
-.*:	b3 9a 50 69 [	 ]*cfxbr	%r6,5,%f9
+.*:	b3 9a 50 58 [	 ]*cfxbr	%r5,5,%f8
 .*:	b3 b9 90 65 [	 ]*cfdr	%r6,9,%f5
 .*:	b3 b8 90 65 [	 ]*cfer	%r6,9,%f5
-.*:	b3 ba 90 65 [	 ]*cfxr	%r6,9,%f5
+.*:	b3 ba 90 56 [	 ]*cfxr	%r5,9,%f6
 .*:	49 65 af ff [	 ]*ch	%r6,4095\(%r5,%r10\)
 .*:	a7 6e 80 01 [	 ]*chi	%r6,-32767
 .*:	b2 41 00 69 [	 ]*cksm	%r6,%r9
@@ -128,12 +128,12 @@ Disassembly of section .text:
 .*:	ba 69 5f ff [	 ]*cs	%r6,%r9,4095\(%r5\)
 .*:	b2 30 00 00 [	 ]*csch
 .*:	b2 50 00 69 [	 ]*csp	%r6,%r9
-.*:	b2 57 00 69 [	 ]*cuse	%r6,%r9
-.*:	b2 a7 00 69 [	 ]*cutfu	%r6,%r9
-.*:	b2 a6 00 69 [	 ]*cuutf	%r6,%r9
+.*:	b2 57 00 68 [	 ]*cuse	%r6,%r8
+.*:	b2 a7 00 68 [	 ]*cutfu	%r6,%r8
+.*:	b2 a6 00 68 [	 ]*cuutf	%r6,%r8
 .*:	4f 65 af ff [	 ]*cvb	%r6,4095\(%r5,%r10\)
 .*:	4e 65 af ff [	 ]*cvd	%r6,4095\(%r5,%r10\)
-.*:	b3 49 00 69 [	 ]*cxbr	%f6,%f9
+.*:	b3 49 00 68 [	 ]*cxbr	%f6,%f8
 .*:	b3 96 00 69 [	 ]*cxfbr	%f6,%r9
 .*:	b3 b6 00 69 [	 ]*cxfr	%f6,%r9
 .*:	b3 69 00 69 [	 ]*cxr	%f6,%f9
@@ -151,8 +151,8 @@ Disassembly of section .text:
 .*:	b3 53 9a 65 [	 ]*diebr	%f6,%f9,%f5,10
 .*:	fd 58 5f ff af ff [	 ]*dp	4095\(6,%r5\),4095\(9,%r10\)
 .*:	1d 69 [	 ]*dr	%r6,%r9
-.*:	b3 4d 00 69 [	 ]*dxbr	%f6,%f9
-.*:	b2 2d 00 69 [	 ]*dxr	%f6,%f9
+.*:	b3 4d 00 68 [	 ]*dxbr	%f6,%f8
+.*:	b2 2d 00 68 [	 ]*dxr	%f6,%f8
 .*:	b2 4f 00 69 [	 ]*ear	%r6,%a9
 .*:	de ff 5f ff af ff [	 ]*ed	4095\(256,%r5\),4095\(%r10\)
 .*:	df ff 5f ff af ff [	 ]*edmk	4095\(256,%r5\),4095\(%r10\)
@@ -166,8 +166,8 @@ Disassembly of section .text:
 .*:	b3 7f 00 69 [	 ]*fidr	%f6,%f9
 .*:	b3 57 50 69 [	 ]*fiebr	%f6,5,%f9
 .*:	b3 77 00 69 [	 ]*fier	%f6,%f9
-.*:	b3 47 50 69 [	 ]*fixbr	%f6,5,%f9
-.*:	b3 67 00 69 [	 ]*fixr	%f6,%f9
+.*:	b3 47 50 68 [	 ]*fixbr	%f6,5,%f8
+.*:	b3 67 00 68 [	 ]*fixr	%f6,%f8
 .*:	24 69 [	 ]*hdr	%f6,%f9
 .*:	34 69 [	 ]*her	%f6,%f9
 .*:	b2 31 00 00 [	 ]*hsch
@@ -216,22 +216,22 @@ Disassembly of section .text:
 .*:	33 69 [	 ]*lcer	%f6,%f9
 .*:	13 69 [	 ]*lcr	%r6,%r9
 .*:	b7 69 5f ff [	 ]*lctl	%c6,%c9,4095\(%r5\)
-.*:	b3 43 00 69 [	 ]*lcxbr	%f6,%f9
-.*:	b3 63 00 69 [	 ]*lcxr	%f6,%f9
+.*:	b3 43 00 68 [	 ]*lcxbr	%f6,%f8
+.*:	b3 63 00 68 [	 ]*lcxr	%f6,%f8
 .*:	68 65 af ff [	 ]*ld	%f6,4095\(%r5,%r10\)
 .*:	ed 65 af ff 00 24 [	 ]*lde	%f6,4095\(%r5,%r10\)
 .*:	ed 65 af ff 00 04 [	 ]*ldeb	%f6,4095\(%r5,%r10\)
 .*:	b3 04 00 69 [	 ]*ldebr	%f6,%f9
 .*:	b3 24 00 69 [	 ]*lder	%f6,%f9
 .*:	28 69 [	 ]*ldr	%f6,%f9
-.*:	b3 45 00 69 [	 ]*ldxbr	%f6,%f9
-.*:	25 69 [	 ]*ldxr	%f6,%f9
+.*:	b3 45 00 68 [	 ]*ldxbr	%f6,%f8
+.*:	25 68 [	 ]*ldxr	%f6,%f8
 .*:	78 65 af ff [	 ]*le	%f6,4095\(%r5,%r10\)
 .*:	b3 44 00 69 [	 ]*ledbr	%f6,%f9
 .*:	35 69 [	 ]*ledr	%f6,%f9
 .*:	38 69 [	 ]*ler	%f6,%f9
-.*:	b3 46 00 69 [	 ]*lexbr	%f6,%f9
-.*:	b3 66 00 69 [	 ]*lexr	%f6,%f9
+.*:	b3 46 00 68 [	 ]*lexbr	%f6,%f8
+.*:	b3 66 00 68 [	 ]*lexr	%f6,%f8
 .*:	b2 9d 5f ff [	 ]*lfpc	4095\(%r5\)
 .*:	48 65 af ff [	 ]*lh	%r6,4095\(%r5,%r10\)
 .*:	a7 68 80 01 [	 ]*lhi	%r6,-32767
@@ -241,27 +241,27 @@ Disassembly of section .text:
 .*:	b3 01 00 69 [	 ]*lnebr	%f6,%f9
 .*:	31 69 [	 ]*lner	%f6,%f9
 .*:	11 69 [	 ]*lnr	%r6,%r9
-.*:	b3 41 00 69 [	 ]*lnxbr	%f6,%f9
-.*:	b3 61 00 69 [	 ]*lnxr	%f6,%f9
+.*:	b3 41 00 68 [	 ]*lnxbr	%f6,%f8
+.*:	b3 61 00 68 [	 ]*lnxr	%f6,%f8
 .*:	b3 10 00 69 [	 ]*lpdbr	%f6,%f9
 .*:	20 69 [	 ]*lpdr	%f6,%f9
 .*:	b3 00 00 69 [	 ]*lpebr	%f6,%f9
 .*:	30 69 [	 ]*lper	%f6,%f9
 .*:	10 69 [	 ]*lpr	%r6,%r9
 .*:	82 00 5f ff [	 ]*lpsw	4095\(%r5\)
-.*:	b3 40 00 69 [	 ]*lpxbr	%f6,%f9
-.*:	b3 60 00 69 [	 ]*lpxr	%f6,%f9
+.*:	b3 40 00 68 [	 ]*lpxbr	%f6,%f8
+.*:	b3 60 00 68 [	 ]*lpxr	%f6,%f8
 .*:	18 69 [	 ]*lr	%r6,%r9
 .*:	b1 65 af ff [	 ]*lra	%r6,4095\(%r5,%r10\)
-.*:	25 69 [	 ]*ldxr	%f6,%f9
+.*:	25 78 [	 ]*ldxr	%f7,%f8
 .*:	35 69 [	 ]*ledr	%f6,%f9
 .*:	b3 12 00 69 [	 ]*ltdbr	%f6,%f9
 .*:	22 69 [	 ]*ltdr	%f6,%f9
 .*:	b3 02 00 69 [	 ]*ltebr	%f6,%f9
 .*:	32 69 [	 ]*lter	%f6,%f9
 .*:	12 69 [	 ]*ltr	%r6,%r9
-.*:	b3 42 00 69 [	 ]*ltxbr	%f6,%f9
-.*:	b3 62 00 69 [	 ]*ltxr	%f6,%f9
+.*:	b3 42 00 68 [	 ]*ltxbr	%f6,%f8
+.*:	b3 62 00 68 [	 ]*ltxr	%f6,%f8
 .*:	b2 4b 00 69 [	 ]*lura	%r6,%r9
 .*:	ed 65 af ff 00 25 [	 ]*lxd	%f6,4095\(%r5,%r10\)
 .*:	ed 65 af ff 00 05 [	 ]*lxdb	%f6,4095\(%r5,%r10\)
@@ -271,7 +271,7 @@ Disassembly of section .text:
 .*:	ed 65 af ff 00 06 [	 ]*lxeb	%f6,4095\(%r5,%r10\)
 .*:	b3 06 00 69 [	 ]*lxebr	%f6,%f9
 .*:	b3 26 00 69 [	 ]*lxer	%f6,%f9
-.*:	b3 65 00 69 [	 ]*lxr	%f6,%f9
+.*:	b3 65 00 68 [	 ]*lxr	%f6,%f8
 .*:	b3 75 00 60 [	 ]*lzdr	%f6
 .*:	b3 74 00 60 [	 ]*lzer	%f6
 .*:	b3 76 00 60 [	 ]*lzxr	%f6
@@ -312,8 +312,8 @@ Disassembly of section .text:
 .*:	e8 ff 5f ff af ff [	 ]*mvcin	4095\(256,%r5\),4095\(%r10\)
 .*:	d9 69 5f ff af ff [	 ]*mvck	4095\(%r6,%r5\),4095\(%r10\),%r9
 .*:	0e 69 [	 ]*mvcl	%r6,%r9
-.*:	a8 69 5f ff [	 ]*mvcle	%r6,%r9,4095\(%r5\)
-.*:	eb 69 5f ff 00 8e [	 ]*mvclu	%r6,%r9,4095\(%r5\)
+.*:	a8 68 5f ff [	 ]*mvcle	%r6,%r8,4095\(%r5\)
+.*:	eb 68 5f ff 00 8e [	 ]*mvclu	%r6,%r8,4095\(%r5\)
 .*:	da 69 5f ff af ff [	 ]*mvcp	4095\(%r6,%r5\),4095\(%r10\),%r9
 .*:	db 69 5f ff af ff [	 ]*mvcs	4095\(%r6,%r5\),4095\(%r10\),%r9
 .*:	e5 0e 5f ff af ff [	 ]*mvcsk	4095\(%r5\),4095\(%r10\)
@@ -323,12 +323,12 @@ Disassembly of section .text:
 .*:	b2 54 00 69 [	 ]*mvpg	%r6,%r9
 .*:	b2 55 00 69 [	 ]*mvst	%r6,%r9
 .*:	d3 ff 5f ff af ff [	 ]*mvz	4095\(256,%r5\),4095\(%r10\)
-.*:	b3 4c 00 69 [	 ]*mxbr	%f6,%f9
+.*:	b3 4c 00 68 [	 ]*mxbr	%f6,%f8
 .*:	67 65 af ff [	 ]*mxd	%f6,4095\(%r5,%r10\)
 .*:	ed 65 af ff 00 07 [	 ]*mxdb	%f6,4095\(%r5,%r10\)
 .*:	b3 07 00 69 [	 ]*mxdbr	%f6,%f9
 .*:	27 69 [	 ]*mxdr	%f6,%f9
-.*:	26 69 [	 ]*mxr	%f6,%f9
+.*:	26 68 [	 ]*mxr	%f6,%f8
 .*:	54 65 af ff [	 ]*n	%r6,4095\(%r5,%r10\)
 .*:	d4 ff 5f ff af ff [	 ]*nc	4095\(256,%r5\),4095\(%r10\)
 .*:	94 ff 5f ff [	 ]*ni	4095\(%r5\),255
@@ -395,8 +395,8 @@ Disassembly of section .text:
 .*:	ed 65 af ff 00 14 [	 ]*sqeb	%f6,4095\(%r5,%r10\)
 .*:	b3 14 00 69 [	 ]*sqebr	%f6,%f9
 .*:	b2 45 00 69 [	 ]*sqer	%f6,%f9
-.*:	b3 16 00 69 [	 ]*sqxbr	%f6,%f9
-.*:	b3 36 00 69 [	 ]*sqxr	%f6,%f9
+.*:	b3 16 00 68 [	 ]*sqxbr	%f6,%f8
+.*:	b3 36 00 68 [	 ]*sqxr	%f6,%f8
 .*:	1b 69 [	 ]*sr	%r6,%r9
 .*:	8a 60 5f ff [	 ]*sra	%r6,4095\(%r5\)
 .*:	8e 60 5f ff [	 ]*srda	%r6,4095\(%r5\)
@@ -438,8 +438,8 @@ Disassembly of section .text:
 .*:	0a ff [	 ]*svc	255
 .*:	6f 65 af ff [	 ]*sw	%f6,4095\(%r5,%r10\)
 .*:	2f 69 [	 ]*swr	%f6,%f9
-.*:	b3 4b 00 69 [	 ]*sxbr	%f6,%f9
-.*:	37 69 [	 ]*sxr	%f6,%f9
+.*:	b3 4b 00 68 [	 ]*sxbr	%f6,%f8
+.*:	37 68 [	 ]*sxr	%f6,%f8
 .*:	b2 4c 00 69 [	 ]*tar	%a6,%r9
 .*:	b2 2c 00 06 [	 ]*tb	%r6
 .*:	b3 51 50 69 [	 ]*tbdr	%f6,5,%f9
@@ -462,11 +462,11 @@ Disassembly of section .text:
 .*:	01 ff [	 ]*trap2
 .*:	b2 ff 5f ff [	 ]*trap4	4095\(%r5\)
 .*:	b2 a5 00 69 [	 ]*tre	%r6,%r9
-.*:	b9 93 00 69 [	 ]*troo	%r6,%r9
-.*:	b9 92 00 69 [	 ]*trot	%r6,%r9
+.*:	b9 93 00 68 [	 ]*troo	%r6,%r8
+.*:	b9 92 00 68 [	 ]*trot	%r6,%r8
 .*:	dd ff 5f ff af ff [	 ]*trt	4095\(256,%r5\),4095\(%r10\)
-.*:	b9 91 00 69 [	 ]*trto	%r6,%r9
-.*:	b9 90 00 69 [	 ]*trtt	%r6,%r9
+.*:	b9 91 00 68 [	 ]*trto	%r6,%r8
+.*:	b9 90 00 68 [	 ]*trtt	%r6,%r8
 .*:	93 00 5f ff [	 ]*ts	4095\(%r5\)
 .*:	b2 35 5f ff [	 ]*tsch	4095\(%r5\)
 .*:	f3 58 5f ff af ff [	 ]*unpk	4095\(6,%r5\),4095\(9,%r10\)
diff --git a/gas/testsuite/gas/s390/esa-g5.s b/gas/testsuite/gas/s390/esa-g5.s
index b74140c..213ec3d 100644
--- a/gas/testsuite/gas/s390/esa-g5.s
+++ b/gas/testsuite/gas/s390/esa-g5.s
@@ -19,8 +19,8 @@ foo:
 	aur	%f6,%f9
 	aw	%f6,4095(%r5,%r10)
 	awr	%f6,%f9
-	axbr	%f6,%f9
-	axr	%f6,%f9
+	axbr	%f6,%f8
+	axr	%f6,%f8
 	b	4095(%r5,%r10)
 	bakr	%r6,%r9
 	bal	%r6,4095(%r5,%r10)
@@ -90,7 +90,7 @@ foo:
 	cdfbr	%f6,%r9
 	cdfr	%f6,%r9
 	cdr	%f6,%f9
-	cds	%r6,%r9,4095(%r5)
+	cds	%r6,%r8,4095(%r5)
 	ce	%f6,4095(%r5,%r10)
 	ceb	%f6,4095(%r5,%r10)
 	cebr	%f6,%f9
@@ -100,10 +100,10 @@ foo:
 	cfc	4095(%r5)
 	cfdbr	%r6,5,%f9
 	cfebr	%r6,5,%f9
-	cfxbr	%r6,5,%f9
+	cfxbr	%r5,5,%f8
 	cfdr	%r6,9,%f5
 	cfer	%r6,9,%f5
-	cfxr	%r6,9,%f5
+	cfxr	%r5,9,%f6
 	ch	%r6,4095(%r5,%r10)
 	chi	%r6,-32767
 	cksm	%r6,%r9
@@ -122,12 +122,12 @@ foo:
 	cs	%r6,%r9,4095(%r5)
 	csch
 	csp	%r6,%r9
-	cuse	%r6,%r9
-	cutfu	%r6,%r9
-	cuutf	%r6,%r9
+	cuse	%r6,%r8
+	cutfu	%r6,%r8
+	cuutf	%r6,%r8
 	cvb	%r6,4095(%r5,%r10)
 	cvd	%r6,4095(%r5,%r10)
-	cxbr	%f6,%f9
+	cxbr	%f6,%f8
 	cxfbr	%f6,%r9
 	cxfr	%f6,%r9
 	cxr	%f6,%f9
@@ -145,8 +145,8 @@ foo:
 	diebr	%f6,%r9,%r5,10
 	dp	4095(6,%r5),4095(9,%r10)
 	dr	%r6,%r9
-	dxbr	%f6,%f9
-	dxr	%f6,%f9
+	dxbr	%f6,%f8
+	dxr	%f6,%f8
 	ear	%r6,%a9
 	ed	4095(256,%r5),4095(%r10)
 	edmk	4095(256,%r5),4095(%r10)
@@ -160,8 +160,8 @@ foo:
 	fidr	%f6,%f9
 	fiebr	%f6,5,%f9
 	fier	%f6,%f9
-	fixbr	%f6,5,%f9
-	fixr	%f6,%f9
+	fixbr	%f6,5,%f8
+	fixr	%f6,%f8
 	hdr	%f6,%f9
 	her	%f6,%f9
 	hsch	
@@ -210,22 +210,22 @@ foo:
 	lcer	%f6,%f9
 	lcr	%r6,%r9
 	lctl	%c6,%c9,4095(%r5)
-	lcxbr	%f6,%f9
-	lcxr	%f6,%f9
+	lcxbr	%f6,%f8
+	lcxr	%f6,%f8
 	ld	%f6,4095(%r5,%r10)
 	lde	%f6,4095(%r5,%r10)
 	ldeb	%f6,4095(%r5,%r10)
 	ldebr	%f6,%f9
 	lder	%f6,%f9
 	ldr	%f6,%f9
-	ldxbr	%f6,%f9
-	ldxr	%f6,%f9
+	ldxbr	%f6,%f8
+	ldxr	%f6,%f8
 	le	%f6,4095(%r5,%r10)
 	ledbr	%f6,%f9
 	ledr	%f6,%f9
 	ler	%f6,%f9
-	lexbr	%f6,%f9
-	lexr	%f6,%f9
+	lexbr	%f6,%f8
+	lexr	%f6,%f8
 	lfpc	4095(%r5)
 	lh	%r6,4095(%r5,%r10)
 	lhi	%r6,-32767
@@ -235,27 +235,27 @@ foo:
 	lnebr	%f6,%f9
 	lner	%f6,%f9
 	lnr	%r6,%r9
-	lnxbr	%f6,%f9
-	lnxr	%f6,%f9
+	lnxbr	%f6,%f8
+	lnxr	%f6,%f8
 	lpdbr	%f6,%f9
 	lpdr	%f6,%f9
 	lpebr	%f6,%f9
 	lper	%f6,%f9
 	lpr	%r6,%r9
 	lpsw	4095(%r5)
-	lpxbr	%f6,%f9
-	lpxr	%f6,%f9
+	lpxbr	%f6,%f8
+	lpxr	%f6,%f8
 	lr	%r6,%r9
 	lra	%r6,4095(%r5,%r10)
-	lrdr	%f6,%f9
+	lrdr	%f7,%f8
 	lrer	%f6,%f9
 	ltdbr	%f6,%f9
 	ltdr	%f6,%f9
 	ltebr	%f6,%f9
 	lter	%f6,%f9
 	ltr	%r6,%r9
-	ltxbr	%f6,%f9
-	ltxr	%f6,%f9
+	ltxbr	%f6,%f8
+	ltxr	%f6,%f8
 	lura	%r6,%r9
 	lxd	%f6,4095(%r5,%r10)
 	lxdb	%f6,4095(%r5,%r10)
@@ -265,7 +265,7 @@ foo:
 	lxeb	%f6,4095(%r5,%r10)
 	lxebr	%f6,%f9
 	lxer	%f6,%f9
-	lxr	%f6,%f9
+	lxr	%f6,%f8
 	lzdr	%f6
 	lzer	%f6
 	lzxr	%f6
@@ -306,8 +306,8 @@ foo:
 	mvcin	4095(256,%r5),4095(%r10)
 	mvck	4095(%r6,%r5),4095(%r10),%r9
 	mvcl	%r6,%r9
-	mvcle	%r6,%r9,4095(%r5)
-	mvclu	%r6,%r9,4095(%r5)
+	mvcle	%r6,%r8,4095(%r5)
+	mvclu	%r6,%r8,4095(%r5)
 	mvcp	4095(%r6,%r5),4095(%r10),%r9
 	mvcs	4095(%r6,%r5),4095(%r10),%r9
 	mvcsk	4095(%r5),4095(%r10)
@@ -317,12 +317,12 @@ foo:
 	mvpg	%r6,%r9
 	mvst	%r6,%r9
 	mvz	4095(256,%r5),4095(%r10)
-	mxbr	%f6,%f9
+	mxbr	%f6,%f8
 	mxd	%f6,4095(%r5,%r10)
 	mxdb	%f6,4095(%r5,%r10)
 	mxdbr	%f6,%f9
 	mxdr	%f6,%f9
-	mxr	%f6,%f9
+	mxr	%f6,%f8
 	n	%r6,4095(%r5,%r10)
 	nc	4095(256,%r5),4095(%r10)
 	ni	4095(%r5),255
@@ -389,8 +389,8 @@ foo:
 	sqeb	%f6,4095(%r5,%r10)
 	sqebr	%f6,%f9
 	sqer	%f6,%f9
-	sqxbr	%f6,%f9
-	sqxr	%f6,%f9
+	sqxbr	%f6,%f8
+	sqxr	%f6,%f8
 	sr	%r6,%r9
 	sra	%r6,4095(%r5)
 	srda	%r6,4095(%r5)
@@ -432,8 +432,8 @@ foo:
 	svc	255
 	sw	%f6,4095(%r5,%r10)
 	swr	%f6,%f9
-	sxbr	%f6,%f9
-	sxr	%f6,%f9
+	sxbr	%f6,%f8
+	sxr	%f6,%f8
 	tar	%a6,%r9
 	tb	%r6
 	tbdr	%r6,5,%r9
@@ -456,11 +456,11 @@ foo:
 	trap2
 	trap4	4095(%r5)
 	tre	%r6,%r9
-	troo	%r6,%r9
-	trot	%r6,%r9
+	troo	%r6,%r8
+	trot	%r6,%r8
 	trt	4095(256,%r5),4095(%r10)
-	trto	%r6,%r9
-	trtt	%r6,%r9
+	trto	%r6,%r8
+	trtt	%r6,%r8
 	ts	4095(%r5)
 	tsch	4095(%r5)
 	unpk	4095(6,%r5),4095(9,%r10)
diff --git a/gas/testsuite/gas/s390/esa-z9-109.d b/gas/testsuite/gas/s390/esa-z9-109.d
index d037909..c379c46 100644
--- a/gas/testsuite/gas/s390/esa-z9-109.d
+++ b/gas/testsuite/gas/s390/esa-z9-109.d
@@ -6,8 +6,8 @@
 Disassembly of section .text:
 
 .* <foo>:
-.*:	b9 93 f0 69 [	 ]*troo	%r6,%r9,15
-.*:	b9 92 f0 69 [	 ]*trot	%r6,%r9,15
-.*:	b9 91 f0 69 [	 ]*trto	%r6,%r9,15
-.*:	b9 90 f0 69 [	 ]*trtt	%r6,%r9,15
+.*:	b9 93 f0 68 [	 ]*troo	%r6,%r8,15
+.*:	b9 92 f0 68 [	 ]*trot	%r6,%r8,15
+.*:	b9 91 f0 68 [	 ]*trto	%r6,%r8,15
+.*:	b9 90 f0 68 [	 ]*trtt	%r6,%r8,15
 .*:	b2 2b 00 69 [	 ]*sske	%r6,%r9
diff --git a/gas/testsuite/gas/s390/esa-z9-109.s b/gas/testsuite/gas/s390/esa-z9-109.s
index 49ffaf6..438f76e 100644
--- a/gas/testsuite/gas/s390/esa-z9-109.s
+++ b/gas/testsuite/gas/s390/esa-z9-109.s
@@ -1,9 +1,9 @@
 .text
 foo:
-	troo	%r6,%r9,15
-	trot	%r6,%r9,15
-	trto	%r6,%r9,15
-	trtt	%r6,%r9,15
+	troo	%r6,%r8,15
+	trot	%r6,%r8,15
+	trto	%r6,%r8,15
+	trtt	%r6,%r8,15
 # z9-109 z/Architecture mode extended sske with an additional parameter
 # make sure the old version still works for esa
 	sske	%r6,%r9
diff --git a/gas/testsuite/gas/s390/zarch-z196.d b/gas/testsuite/gas/s390/zarch-z196.d
index 8225600..0ac7a5f 100644
--- a/gas/testsuite/gas/s390/zarch-z196.d
+++ b/gas/testsuite/gas/s390/zarch-z196.d
@@ -200,56 +200,56 @@ Disassembly of section .text:
 .*:	b9 ae 00 67 [ 	]*rrbm	%r6,%r7
 .*:	b3 94 37 59 [ 	]*cefbra	%f5,3,%r9,7
 .*:	b3 95 37 59 [ 	]*cdfbra	%f5,3,%r9,7
-.*:	b3 96 37 59 [ 	]*cxfbra	%f5,3,%r9,7
+.*:	b3 96 37 69 [ 	]*cxfbra	%f6,3,%r9,7
 .*:	b3 a4 37 59 [ 	]*cegbra	%f5,3,%r9,7
 .*:	b3 a5 37 59 [ 	]*cdgbra	%f5,3,%r9,7
-.*:	b3 a6 37 59 [ 	]*cxgbra	%f5,3,%r9,7
+.*:	b3 a6 37 69 [ 	]*cxgbra	%f6,3,%r9,7
 .*:	b3 90 37 59 [ 	]*celfbr	%f5,3,%r9,7
 .*:	b3 91 37 59 [ 	]*cdlfbr	%f5,3,%r9,7
-.*:	b3 92 37 59 [ 	]*cxlfbr	%f5,3,%r9,7
+.*:	b3 92 37 69 [ 	]*cxlfbr	%f6,3,%r9,7
 .*:	b3 a0 37 59 [ 	]*celgbr	%f5,3,%r9,7
 .*:	b3 a1 37 59 [ 	]*cdlgbr	%f5,3,%r9,7
-.*:	b3 a2 37 59 [ 	]*cxlgbr	%f5,3,%r9,7
+.*:	b3 a2 37 69 [ 	]*cxlgbr	%f6,3,%r9,7
 .*:	b3 98 37 59 [ 	]*cfebra	%r5,3,%f9,7
 .*:	b3 99 37 59 [ 	]*cfdbra	%r5,3,%f9,7
-.*:	b3 9a 37 59 [ 	]*cfxbra	%r5,3,%f9,7
+.*:	b3 9a 37 58 [ 	]*cfxbra	%r5,3,%f8,7
 .*:	b3 a8 37 59 [ 	]*cgebra	%r5,3,%f9,7
 .*:	b3 a9 37 59 [ 	]*cgdbra	%r5,3,%f9,7
-.*:	b3 aa 37 59 [ 	]*cgxbra	%r5,3,%f9,7
+.*:	b3 aa 37 58 [ 	]*cgxbra	%r5,3,%f8,7
 .*:	b3 9c 37 59 [ 	]*clfebr	%r5,3,%f9,7
 .*:	b3 9d 37 59 [ 	]*clfdbr	%r5,3,%f9,7
-.*:	b3 9e 37 59 [ 	]*clfxbr	%r5,3,%f9,7
+.*:	b3 9e 37 58 [ 	]*clfxbr	%r5,3,%f8,7
 .*:	b3 ac 37 59 [ 	]*clgebr	%r5,3,%f9,7
 .*:	b3 ad 37 59 [ 	]*clgdbr	%r5,3,%f9,7
-.*:	b3 ae 37 59 [ 	]*clgxbr	%r5,3,%f9,7
+.*:	b3 ae 37 58 [ 	]*clgxbr	%r5,3,%f8,7
 .*:	b3 57 37 59 [ 	]*fiebra	%f5,3,%f9,7
 .*:	b3 5f 37 59 [ 	]*fidbra	%f5,3,%f9,7
-.*:	b3 47 37 59 [ 	]*fixbra	%f5,3,%f9,7
+.*:	b3 47 37 68 [ 	]*fixbra	%f6,3,%f8,7
 .*:	b3 44 37 59 [ 	]*ledbra	%f5,3,%f9,7
-.*:	b3 45 37 59 [ 	]*ldxbra	%f5,3,%f9,7
-.*:	b3 46 37 59 [ 	]*lexbra	%f5,3,%f9,7
+.*:	b3 45 37 68 [ 	]*ldxbra	%f6,3,%f8,7
+.*:	b3 46 37 68 [ 	]*lexbra	%f6,3,%f8,7
 .*:	b3 d2 97 35 [ 	]*adtra	%f3,%f5,%f9,7
-.*:	b3 da 97 35 [ 	]*axtra	%f3,%f5,%f9,7
+.*:	b3 da 67 24 [ 	]*axtra	%f2,%f4,%f6,7
 .*:	b3 f1 37 59 [ 	]*cdgtra	%f5,3,%r9,7
 .*:	b9 51 37 59 [ 	]*cdftr	%f5,3,%r9,7
-.*:	b9 59 37 59 [ 	]*cxftr	%f5,3,%r9,7
-.*:	b3 f9 37 59 [ 	]*cxgtra	%f5,3,%r9,7
+.*:	b9 59 37 69 [ 	]*cxftr	%f6,3,%r9,7
+.*:	b3 f9 37 69 [ 	]*cxgtra	%f6,3,%r9,7
 .*:	b9 52 37 59 [ 	]*cdlgtr	%f5,3,%r9,7
-.*:	b9 5a 37 59 [ 	]*cxlgtr	%f5,3,%r9,7
+.*:	b9 5a 37 69 [ 	]*cxlgtr	%f6,3,%r9,7
 .*:	b9 53 37 59 [ 	]*cdlftr	%f5,3,%r9,7
 .*:	b9 5b 37 59 [ 	]*cxlftr	%f5,3,%r9,7
 .*:	b3 e1 37 59 [ 	]*cgdtra	%r5,3,%f9,7
-.*:	b3 e9 37 59 [ 	]*cgxtra	%r5,3,%f9,7
+.*:	b3 e9 37 58 [ 	]*cgxtra	%r5,3,%f8,7
 .*:	b9 41 37 59 [ 	]*cfdtr	%r5,3,%f9,7
 .*:	b9 49 37 59 [ 	]*cfxtr	%r5,3,%f9,7
 .*:	b9 42 37 59 [ 	]*clgdtr	%r5,3,%f9,7
-.*:	b9 4a 37 59 [ 	]*clgxtr	%r5,3,%f9,7
+.*:	b9 4a 37 58 [ 	]*clgxtr	%r5,3,%f8,7
 .*:	b9 43 37 59 [ 	]*clfdtr	%r5,3,%f9,7
-.*:	b9 4b 37 59 [ 	]*clfxtr	%r5,3,%f9,7
+.*:	b9 4b 37 58 [ 	]*clfxtr	%r5,3,%f8,7
 .*:	b3 d1 97 35 [ 	]*ddtra	%f3,%f5,%f9,7
-.*:	b3 d9 97 35 [ 	]*dxtra	%f3,%f5,%f9,7
+.*:	b3 d9 67 24 [ 	]*dxtra	%f2,%f4,%f6,7
 .*:	b3 d0 97 35 [ 	]*mdtra	%f3,%f5,%f9,7
-.*:	b3 d8 97 35 [ 	]*mxtra	%f3,%f5,%f9,7
+.*:	b3 d8 67 24 [ 	]*mxtra	%f2,%f4,%f6,7
 .*:	b3 d3 97 35 [ 	]*sdtra	%f3,%f5,%f9,7
-.*:	b3 db 97 35 [ 	]*sxtra	%f3,%f5,%f9,7
+.*:	b3 db 67 24 [ 	]*sxtra	%f2,%f4,%f6,7
 .*:	b2 b8 7f a0 [ 	]*srnmb	4000\(%r7\)
diff --git a/gas/testsuite/gas/s390/zarch-z196.s b/gas/testsuite/gas/s390/zarch-z196.s
index 2b49c95..dd5b862 100644
--- a/gas/testsuite/gas/s390/zarch-z196.s
+++ b/gas/testsuite/gas/s390/zarch-z196.s
@@ -202,56 +202,56 @@ foo:
 
 	cefbra %f5,3,%r9,7
 	cdfbra %f5,3,%r9,7
-	cxfbra %f5,3,%r9,7
+	cxfbra %f6,3,%r9,7
 	cegbra %f5,3,%r9,7
 	cdgbra %f5,3,%r9,7
-	cxgbra %f5,3,%r9,7
+	cxgbra %f6,3,%r9,7
 	celfbr %f5,3,%r9,7
 	cdlfbr %f5,3,%r9,7
-	cxlfbr %f5,3,%r9,7
+	cxlfbr %f6,3,%r9,7
 	celgbr %f5,3,%r9,7
 	cdlgbr %f5,3,%r9,7
-	cxlgbr %f5,3,%r9,7
+	cxlgbr %f6,3,%r9,7
 	cfebra %r5,3,%f9,7
 	cfdbra %r5,3,%f9,7
-	cfxbra %r5,3,%f9,7
+	cfxbra %r5,3,%f8,7
 	cgebra %r5,3,%f9,7
 	cgdbra %r5,3,%f9,7
-	cgxbra %r5,3,%f9,7
+	cgxbra %r5,3,%f8,7
 	clfebr %r5,3,%f9,7
 	clfdbr %r5,3,%f9,7
-	clfxbr %r5,3,%f9,7
+	clfxbr %r5,3,%f8,7
 	clgebr %r5,3,%f9,7
 	clgdbr %r5,3,%f9,7
-	clgxbr %r5,3,%f9,7
+	clgxbr %r5,3,%f8,7
 	fiebra %f5,3,%f9,7
 	fidbra %f5,3,%f9,7
-	fixbra %f5,3,%f9,7
+	fixbra %f6,3,%f8,7
 	ledbra %f5,3,%f9,7
-	ldxbra %f5,3,%f9,7
-	lexbra %f5,3,%f9,7
+	ldxbra %f6,3,%f8,7
+	lexbra %f6,3,%f8,7
 	adtra %f3,%f5,%f9,7
-	axtra %f3,%f5,%f9,7
+	axtra %f2,%f4,%f6,7
 	cdgtra %f5,3,%r9,7
 	cdftr %f5,3,%r9,7
-	cxftr %f5,3,%r9,7
-	cxgtra %f5,3,%r9,7
+	cxftr %f6,3,%r9,7
+	cxgtra %f6,3,%r9,7
 	cdlgtr %f5,3,%r9,7
-	cxlgtr %f5,3,%r9,7
+	cxlgtr %f6,3,%r9,7
 	cdlftr %f5,3,%r9,7
 	cxlftr %f5,3,%r9,7
 	cgdtra %r5,3,%f9,7
-	cgxtra %r5,3,%f9,7
+	cgxtra %r5,3,%f8,7
 	cfdtr %r5,3,%f9,7
 	cfxtr %r5,3,%f9,7
 	clgdtr %r5,3,%f9,7
-	clgxtr %r5,3,%f9,7
+	clgxtr %r5,3,%f8,7
 	clfdtr %r5,3,%f9,7
-	clfxtr %r5,3,%f9,7
+	clfxtr %r5,3,%f8,7
 	ddtra %f3,%f5,%f9,7
-	dxtra %f3,%f5,%f9,7
+	dxtra %f2,%f4,%f6,7
 	mdtra %f3,%f5,%f9,7
-	mxtra %f3,%f5,%f9,7
+	mxtra %f2,%f4,%f6,7
 	sdtra %f3,%f5,%f9,7
-	sxtra %f3,%f5,%f9,7
+	sxtra %f2,%f4,%f6,7
 	srnmb 4000(%r7)
diff --git a/gas/testsuite/gas/s390/zarch-z9-109.d b/gas/testsuite/gas/s390/zarch-z9-109.d
index 7c5797d..73fb558 100644
--- a/gas/testsuite/gas/s390/zarch-z9-109.d
+++ b/gas/testsuite/gas/s390/zarch-z9-109.d
@@ -45,12 +45,12 @@ Disassembly of section .text:
 .*:	c8 60 5f ff af ff [	 ]*mvcos	4095\(%r5\),4095\(%r10\),%r6
 .*:	b9 aa 5f 69 [	 ]*lptea	%r6,%r9,%r5,15
 .*:	b2 2b f0 69 [	 ]*sske	%r6,%r9,15
-.*:	b9 b1 f0 69 [	 ]*cu24	%r6,%r9,15
-.*:	b2 a6 f0 69 [	 ]*cu21	%r6,%r9,15
-.*:	b9 b3 00 69 [	 ]*cu42	%r6,%r9
-.*:	b9 b2 00 69 [	 ]*cu41	%r6,%r9
-.*:	b2 a7 f0 69 [	 ]*cu12	%r6,%r9,15
-.*:	b9 b0 f0 69 [	 ]*cu14	%r6,%r9,15
+.*:	b9 b1 f0 68 [	 ]*cu24	%r6,%r8,15
+.*:	b2 a6 f0 68 [	 ]*cu21	%r6,%r8,15
+.*:	b9 b3 00 68 [	 ]*cu42	%r6,%r8
+.*:	b9 b2 00 68 [	 ]*cu41	%r6,%r8
+.*:	b2 a7 f0 68 [	 ]*cu12	%r6,%r8,15
+.*:	b9 b0 f0 68 [	 ]*cu14	%r6,%r8,15
 .*:	b3 3b 60 95 [	 ]*myr	%f6,%f9,%f5
 .*:	b3 3d 60 95 [	 ]*myhr	%f6,%f9,%f5
 .*:	b3 39 60 95 [	 ]*mylr	%f6,%f9,%f5
diff --git a/gas/testsuite/gas/s390/zarch-z9-109.s b/gas/testsuite/gas/s390/zarch-z9-109.s
index 35f1140..785c013 100644
--- a/gas/testsuite/gas/s390/zarch-z9-109.s
+++ b/gas/testsuite/gas/s390/zarch-z9-109.s
@@ -39,12 +39,12 @@ foo:
 	mvcos	4095(%r5),4095(%r10),%r6
 	lptea	%r6,%r9,%r5,15
 	sske	%r6,%r9,15
-	cu24	%r6,%r9,15
-	cu21	%r6,%r9,15
-	cu42	%r6,%r9
-	cu41	%r6,%r9
-	cu12	%r6,%r9,15
-	cu14	%r6,%r9,15
+	cu24	%r6,%r8,15
+	cu21	%r6,%r8,15
+	cu42	%r6,%r8
+	cu41	%r6,%r8
+	cu12	%r6,%r8,15
+	cu14	%r6,%r8,15
 	myr	%f6,%f9,%f5
 	myhr	%f6,%f9,%f5
 	mylr	%f6,%f9,%f5
diff --git a/gas/testsuite/gas/s390/zarch-z900.d b/gas/testsuite/gas/s390/zarch-z900.d
index 2cb352f..561fca6 100644
--- a/gas/testsuite/gas/s390/zarch-z900.d
+++ b/gas/testsuite/gas/s390/zarch-z900.d
@@ -26,7 +26,7 @@ Disassembly of section .text:
 .*:	eb 96 5f ff 00 45 [ 	]*bxleg	%r9,%r6,4095\(%r5\)
 .*:	b3 a5 00 96 [ 	]*cdgbr	%f9,%r6
 .*:	b3 c5 00 96 [ 	]*cdgr	%f9,%r6
-.*:	eb 96 5f ff 00 3e [ 	]*cdsg	%r9,%r6,4095\(%r5\)
+.*:	eb 86 5f ff 00 3e [ 	]*cdsg	%r8,%r6,4095\(%r5\)
 .*:	b3 a4 00 96 [ 	]*cegbr	%f9,%r6
 .*:	b3 c4 00 96 [ 	]*cegr	%f9,%r6
 .*:	e3 95 af ff 00 20 [ 	]*cg	%r9,4095\(%r5,%r10\)
@@ -38,8 +38,8 @@ Disassembly of section .text:
 .*:	b9 30 00 96 [ 	]*cgfr	%r9,%r6
 .*:	a7 9f 80 01 [ 	]*cghi	%r9,-32767
 .*:	b9 20 00 96 [ 	]*cgr	%r9,%r6
-.*:	b3 aa f0 65 [ 	]*cgxbr	%r6,15,%f5
-.*:	b3 ca f0 65 [ 	]*cgxr	%r6,15,%f5
+.*:	b3 aa f0 64 [ 	]*cgxbr	%r6,15,%f4
+.*:	b3 ca f0 64 [ 	]*cgxr	%r6,15,%f4
 .*:	e3 95 af ff 00 21 [ 	]*clg	%r9,4095\(%r5,%r10\)
 .*:	e3 95 af ff 00 31 [ 	]*clgf	%r9,4095\(%r5,%r10\)
 .*:	b9 31 00 96 [ 	]*clgfr	%r9,%r6
@@ -48,14 +48,14 @@ Disassembly of section .text:
 .*:	eb 96 5f ff 00 30 [ 	]*csg	%r9,%r6,4095\(%r5\)
 .*:	e3 95 af ff 00 0e [ 	]*cvbg	%r9,4095\(%r5,%r10\)
 .*:	e3 95 af ff 00 2e [ 	]*cvdg	%r9,4095\(%r5,%r10\)
-.*:	b3 a6 00 96 [ 	]*cxgbr	%f9,%r6
-.*:	b3 c6 00 96 [ 	]*cxgr	%f9,%r6
-.*:	e3 95 af ff 00 87 [ 	]*dlg	%r9,4095\(%r5,%r10\)
-.*:	b9 87 00 96 [ 	]*dlgr	%r9,%r6
-.*:	e3 95 af ff 00 0d [ 	]*dsg	%r9,4095\(%r5,%r10\)
-.*:	e3 95 af ff 00 1d [ 	]*dsgf	%r9,4095\(%r5,%r10\)
-.*:	b9 1d 00 96 [ 	]*dsgfr	%r9,%r6
-.*:	b9 0d 00 96 [ 	]*dsgr	%r9,%r6
+.*:	b3 a6 00 86 [ 	]*cxgbr	%f8,%r6
+.*:	b3 c6 00 86 [ 	]*cxgr	%f8,%r6
+.*:	e3 85 af ff 00 87 [ 	]*dlg	%r8,4095\(%r5,%r10\)
+.*:	b9 87 00 86 [ 	]*dlgr	%r8,%r6
+.*:	e3 85 af ff 00 0d [ 	]*dsg	%r8,4095\(%r5,%r10\)
+.*:	e3 85 af ff 00 1d [ 	]*dsgf	%r8,4095\(%r5,%r10\)
+.*:	b9 1d 00 86 [ 	]*dsgfr	%r8,%r6
+.*:	b9 0d 00 86 [ 	]*dsgr	%r8,%r6
 .*:	b9 0e 00 96 [ 	]*eregg	%r9,%r6
 .*:	b9 9d 00 90 [ 	]*esea	%r9
 .*:	eb 9a 5f ff 00 80 [ 	]*icmh	%r9,10,4095\(%r5\)
@@ -89,7 +89,7 @@ Disassembly of section .text:
 .*:	b9 01 00 96 [ 	]*lngr	%r9,%r6
 .*:	b9 10 00 96 [ 	]*lpgfr	%r9,%r6
 .*:	b9 00 00 96 [ 	]*lpgr	%r9,%r6
-.*:	e3 95 af ff 00 8f [ 	]*lpq	%r9,4095\(%r5,%r10\)
+.*:	e3 85 af ff 00 8f [ 	]*lpq	%r8,4095\(%r5,%r10\)
 .*:	b2 b2 5f ff [ 	]*lpswe	4095\(%r5\)
 .*:	e3 95 af ff 00 03 [ 	]*lrag	%r9,4095\(%r5,%r10\)
 .*:	e3 95 af ff 00 0f [ 	]*lrvg	%r9,4095\(%r5,%r10\)
@@ -98,8 +98,8 @@ Disassembly of section .text:
 .*:	b9 02 00 96 [ 	]*ltgr	%r9,%r6
 .*:	b9 05 00 96 [ 	]*lurag	%r9,%r6
 .*:	a7 9d 80 01 [ 	]*mghi	%r9,-32767
-.*:	e3 95 af ff 00 86 [ 	]*mlg	%r9,4095\(%r5,%r10\)
-.*:	b9 86 00 96 [ 	]*mlgr	%r9,%r6
+.*:	e3 85 af ff 00 86 [ 	]*mlg	%r8,4095\(%r5,%r10\)
+.*:	b9 86 00 86 [ 	]*mlgr	%r8,%r6
 .*:	e3 95 af ff 00 0c [ 	]*msg	%r9,4095\(%r5,%r10\)
 .*:	e3 95 af ff 00 1c [ 	]*msgf	%r9,4095\(%r5,%r10\)
 .*:	b9 1c 00 96 [ 	]*msgfr	%r9,%r6
diff --git a/gas/testsuite/gas/s390/zarch-z900.s b/gas/testsuite/gas/s390/zarch-z900.s
index 721244a..a175cca 100644
--- a/gas/testsuite/gas/s390/zarch-z900.s
+++ b/gas/testsuite/gas/s390/zarch-z900.s
@@ -20,7 +20,7 @@ foo:
 	bxleg	%r9,%r6,4095(%r5)
 	cdgbr	%f9,%r6
 	cdgr	%f9,%r6
-	cdsg	%r9,%r6,4095(%r5)
+	cdsg	%r8,%r6,4095(%r5)
 	cegbr	%f9,%r6
 	cegr	%f9,%r6
 	cg	%r9,4095(%r5,%r10)
@@ -32,8 +32,8 @@ foo:
 	cgfr	%r9,%r6
 	cghi	%r9,-32767
 	cgr	%r9,%r6
-	cgxbr	%r6,15,%f5
-	cgxr	%r6,15,%f5
+	cgxbr	%r6,15,%f4
+	cgxr	%r6,15,%f4
 	clg	%r9,4095(%r5,%r10)
 	clgf	%r9,4095(%r5,%r10)
 	clgfr	%r9,%r6
@@ -42,14 +42,14 @@ foo:
 	csg	%r9,%r6,4095(%r5)
 	cvbg	%r9,4095(%r5,%r10)
 	cvdg	%r9,4095(%r5,%r10)
-	cxgbr	%f9,%r6
-	cxgr	%f9,%r6
-	dlg	%r9,4095(%r5,%r10)
-	dlgr	%r9,%r6
-	dsg	%r9,4095(%r5,%r10)
-	dsgf	%r9,4095(%r5,%r10)
-	dsgfr	%r9,%r6
-	dsgr	%r9,%r6
+	cxgbr	%f8,%r6
+	cxgr	%f8,%r6
+	dlg	%r8,4095(%r5,%r10)
+	dlgr	%r8,%r6
+	dsg	%r8,4095(%r5,%r10)
+	dsgf	%r8,4095(%r5,%r10)
+	dsgfr	%r8,%r6
+	dsgr	%r8,%r6
 	eregg	%r9,%r6
 	esea	%r9
 	icmh	%r9,10,4095(%r5)
@@ -83,7 +83,7 @@ foo:
 	lngr	%r9,%r6
 	lpgfr	%r9,%r6
 	lpgr	%r9,%r6
-	lpq	%r9,4095(%r5,%r10)
+	lpq	%r8,4095(%r5,%r10)
 	lpswe	4095(%r5)
 	lrag	%r9,4095(%r5,%r10)
 	lrvg	%r9,4095(%r5,%r10)
@@ -92,8 +92,8 @@ foo:
 	ltgr	%r9,%r6
 	lurag	%r9,%r6
 	mghi	%r9,-32767
-	mlg	%r9,4095(%r5,%r10)
-	mlgr	%r9,%r6
+	mlg	%r8,4095(%r5,%r10)
+	mlgr	%r8,%r6
 	msg	%r9,4095(%r5,%r10)
 	msgf	%r9,4095(%r5,%r10)
 	msgfr	%r9,%r6
diff --git a/gas/testsuite/gas/s390/zarch-z990.d b/gas/testsuite/gas/s390/zarch-z990.d
index dede971..c31d04c 100644
--- a/gas/testsuite/gas/s390/zarch-z990.d
+++ b/gas/testsuite/gas/s390/zarch-z990.d
@@ -18,8 +18,8 @@ Disassembly of section .text:
 .*:	e3 60 50 00 80 46 [	 ]*bctg	%r6,-524288\(%r5\)
 .*:	eb 69 50 00 80 44 [	 ]*bxhg	%r6,%r9,-524288\(%r5\)
 .*:	eb 69 50 00 80 45 [	 ]*bxleg	%r6,%r9,-524288\(%r5\)
-.*:	eb 69 50 00 80 3e [	 ]*cdsg	%r6,%r9,-524288\(%r5\)
-.*:	eb 69 50 00 80 31 [	 ]*cdsy	%r6,%r9,-524288\(%r5\)
+.*:	eb 68 50 00 80 3e [	 ]*cdsg	%r6,%r8,-524288\(%r5\)
+.*:	eb 68 50 00 80 31 [	 ]*cdsy	%r6,%r8,-524288\(%r5\)
 .*:	e3 65 a0 00 80 20 [	 ]*cg	%r6,-524288\(%r5,%r10\)
 .*:	e3 65 a0 00 80 30 [	 ]*cgf	%r6,-524288\(%r5,%r10\)
 .*:	e3 65 a0 00 80 79 [	 ]*chy	%r6,-524288\(%r5,%r10\)
@@ -83,7 +83,7 @@ Disassembly of section .text:
 .*:	e3 65 a0 00 80 0c [	 ]*msg	%r6,-524288\(%r5,%r10\)
 .*:	e3 65 a0 00 80 1c [	 ]*msgf	%r6,-524288\(%r5,%r10\)
 .*:	e3 65 a0 00 80 51 [	 ]*msy	%r6,-524288\(%r5,%r10\)
-.*:	eb 69 50 00 80 8e [	 ]*mvclu	%r6,%r9,-524288\(%r5\)
+.*:	eb 68 50 00 80 8e [	 ]*mvclu	%r6,%r8,-524288\(%r5\)
 .*:	eb ff 50 00 80 52 [	 ]*mviy	-524288\(%r5\),255
 .*:	e3 65 a0 00 80 80 [	 ]*ng	%r6,-524288\(%r5,%r10\)
 .*:	eb ff 50 00 80 54 [	 ]*niy	-524288\(%r5\),255
diff --git a/gas/testsuite/gas/s390/zarch-z990.s b/gas/testsuite/gas/s390/zarch-z990.s
index db2dece..1bea8f2 100644
--- a/gas/testsuite/gas/s390/zarch-z990.s
+++ b/gas/testsuite/gas/s390/zarch-z990.s
@@ -12,8 +12,8 @@ foo:
 	bctg	%r6,-524288(%r5)
 	bxhg	%r6,%r9,-524288(%r5)
 	bxleg	%r6,%r9,-524288(%r5)
-	cdsg	%r6,%r9,-524288(%r5)
-	cdsy	%r6,%r9,-524288(%r5)
+	cdsg	%r6,%r8,-524288(%r5)
+	cdsy	%r6,%r8,-524288(%r5)
 	cg	%r6,-524288(%r5,%r10)
 	cgf	%r6,-524288(%r5,%r10)
 	chy	%r6,-524288(%r5,%r10)
@@ -77,7 +77,7 @@ foo:
 	msg	%r6,-524288(%r5,%r10)
 	msgf	%r6,-524288(%r5,%r10)
 	msy	%r6,-524288(%r5,%r10)
-	mvclu	%r6,%r9,-524288(%r5)
+	mvclu	%r6,%r8,-524288(%r5)
 	mviy	-524288(%r5),255
 	ng	%r6,-524288(%r5,%r10)
 	niy	-524288(%r5),255