7 files changed, 60 insertions, 48 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 6180aa1..939b9f7 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2008-03-06  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+	* gas/s390/esa-g5.d (cdfbr, cdfr, cefbr, cefr, cxfbr, cxfr,
+	dxr, fidr, fier, fixr, lzdr, lzer, lzxr, sqdr, sqer, tp): Fix
+	operand format.
+	* gas/s390/esa-g5.s: Likewise.
+	* gas/s390/zarch-z900.d (cdgbr, cdgr, cegbr, cegr, cxgbr,
+	cxgr): Likewise.
+	* gas/s390/zarch-z900.s: Likewise.
+	* gas/s390/zarch-z9-109.d (cu41, cu42): Remove mask operand.
+	* gas/s390/zarch-z9-109.s: Likewise.
+
 2008-03-04  Paul Brook  <paul@codesourcery.com>
 
 	* gas/arm/archv6m.d: New test.
diff --git a/gas/testsuite/gas/s390/esa-g5.d b/gas/testsuite/gas/s390/esa-g5.d
index 16021f6..7d75142 100644
--- a/gas/testsuite/gas/s390/esa-g5.d
+++ b/gas/testsuite/gas/s390/esa-g5.d
@@ -93,15 +93,15 @@ Disassembly of section .text:
 .*:	69 65 af ff [	 ]*cd	%f6,4095\(%r5,%r10\)
 .*:	ed 65 af ff 00 19 [	 ]*cdb	%f6,4095\(%r5,%r10\)
 .*:	b3 19 00 69 [	 ]*cdbr	%f6,%f9
-.*:	b3 95 00 69 [	 ]*cdfbr	%r6,%f9
-.*:	b3 b5 00 69 [	 ]*cdfr	%r6,%f9
+.*:	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\)
 .*:	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
-.*:	b3 94 00 69 [	 ]*cefbr	%r6,%f9
-.*:	b3 b4 00 69 [	 ]*cefr	%r6,%f9
+.*:	b3 94 00 69 [	 ]*cefbr	%f6,%r9
+.*:	b3 b4 00 69 [	 ]*cefr	%f6,%r9
 .*:	39 69 [	 ]*cer	%f6,%f9
 .*:	b2 1a 5f ff [	 ]*cfc	4095\(%r5\)
 .*:	b3 99 50 69 [	 ]*cfdbr	%r6,5,%f9
@@ -131,8 +131,8 @@ Disassembly of section .text:
 .*:	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 96 00 69 [	 ]*cxfbr	%r6,%f9
-.*:	b3 b6 00 69 [	 ]*cxfr	%r6,%f9
+.*:	b3 96 00 69 [	 ]*cxfbr	%f6,%r9
+.*:	b3 b6 00 69 [	 ]*cxfr	%f6,%r9
 .*:	b3 69 00 69 [	 ]*cxr	%f6,%f9
 .*:	5d 65 af ff [	 ]*d	%r6,4095\(%r5,%r10\)
 .*:	6d 65 af ff [	 ]*dd	%f6,4095\(%r5,%r10\)
@@ -149,7 +149,7 @@ Disassembly of section .text:
 .*:	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 60 [	 ]*dxr	%f6
+.*:	b2 2d 00 69 [	 ]*dxr	%f6,%f9
 .*:	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\)
@@ -160,11 +160,11 @@ Disassembly of section .text:
 .*:	b2 4a 00 69 [	 ]*esta	%r6,%r9
 .*:	44 65 af ff [	 ]*ex	%r6,4095\(%r5,%r10\)
 .*:	b3 5f 50 69 [	 ]*fidbr	%f6,5,%f9
-.*:	b3 7f 50 69 [	 ]*fidr	%f6,5,%f9
+.*:	b3 7f 00 69 [	 ]*fidr	%f6,%f9
 .*:	b3 57 50 69 [	 ]*fiebr	%f6,5,%f9
-.*:	b3 77 50 69 [	 ]*fier	%f6,5,%f9
+.*:	b3 77 00 69 [	 ]*fier	%f6,%f9
 .*:	b3 47 50 69 [	 ]*fixbr	%f6,5,%f9
-.*:	b3 67 50 69 [	 ]*fixr	%f6,5,%f9
+.*:	b3 67 00 69 [	 ]*fixr	%f6,%f9
 .*:	24 69 [	 ]*hdr	%f6,%f9
 .*:	34 69 [	 ]*her	%f6,%f9
 .*:	b2 31 00 00 [	 ]*hsch
@@ -269,9 +269,9 @@ Disassembly of section .text:
 .*:	b3 06 00 69 [	 ]*lxebr	%f6,%f9
 .*:	b3 26 00 69 [	 ]*lxer	%f6,%f9
 .*:	b3 65 00 69 [	 ]*lxr	%r6,%r9
-.*:	b3 75 00 60 [	 ]*lzdr	%r6
-.*:	b3 74 00 60 [	 ]*lzer	%r6
-.*:	b3 76 00 60 [	 ]*lzxr	%r6
+.*:	b3 75 00 60 [	 ]*lzdr	%f6
+.*:	b3 74 00 60 [	 ]*lzer	%f6
+.*:	b3 76 00 60 [	 ]*lzxr	%f6
 .*:	5c 65 af ff [	 ]*m	%r6,4095\(%r5,%r10\)
 .*:	ed 95 af ff 60 1e [	 ]*madb	%f6,%f9,4095\(%r5,%r10\)
 .*:	b3 1e 60 95 [	 ]*madbr	%f6,%f9,%f5
@@ -386,11 +386,11 @@ Disassembly of section .text:
 .*:	b2 10 5f ff [	 ]*spx	4095\(%r5\)
 .*:	ed 65 af ff 00 15 [	 ]*sqdb	%f6,4095\(%r5,%r10\)
 .*:	b3 15 00 69 [	 ]*sqdbr	%f6,%f9
-.*:	b2 44 00 60 [	 ]*sqdr	%f6
+.*:	b2 44 00 69 [	 ]*sqdr	%f6,%f9
 .*:	ed 65 af ff 00 34 [	 ]*sqe	%f6,4095\(%r5,%r10\)
 .*:	ed 65 af ff 00 14 [	 ]*sqeb	%f6,4095\(%r5,%r10\)
 .*:	b3 14 00 69 [	 ]*sqebr	%f6,%f9
-.*:	b2 45 00 60 [	 ]*sqer	%f6
+.*:	b2 45 00 69 [	 ]*sqer	%f6,%f9
 .*:	b3 16 00 69 [	 ]*sqxbr	%f6,%f9
 .*:	b3 36 00 69 [	 ]*sqxr	%f6,%f9
 .*:	1b 69 [	 ]*sr	%r6,%r9
@@ -450,7 +450,7 @@ Disassembly of section .text:
 .*:	a7 61 ff ff [	 ]*tml	%r6,65535
 .*:	a7 60 ff ff [	 ]*tmh	%r6,65535
 .*:	a7 61 ff ff [	 ]*tml	%r6,65535
-.*:	eb 60 5f ff 00 c0 [	 ]*tp	%r6,4095\(%r5\)
+.*:	eb 50 5f ff 00 c0 [	 ]*tp	4095\(6,%r5\)
 .*:	b2 36 5f ff [	 ]*tpi	4095\(%r5\)
 .*:	e5 01 5f ff af ff [	 ]*tprot	4095\(%r5\),4095\(%r10\)
 .*:	dc ff 5f ff af ff [	 ]*tr	4095\(256,%r5\),4095\(%r10\)
diff --git a/gas/testsuite/gas/s390/esa-g5.s b/gas/testsuite/gas/s390/esa-g5.s
index 3ff0b53..8150be7 100644
--- a/gas/testsuite/gas/s390/esa-g5.s
+++ b/gas/testsuite/gas/s390/esa-g5.s
@@ -87,15 +87,15 @@ foo:
 	cd	%f6,4095(%r5,%r10)
 	cdb	%f6,4095(%r5,%r10)
 	cdbr	%f6,%f9
-	cdfbr	%r6,%f9
-	cdfr	%r6,%f9
+	cdfbr	%f6,%r9
+	cdfr	%f6,%r9
 	cdr	%f6,%f9
 	cds	%r6,%r9,4095(%r5)
 	ce	%f6,4095(%r5,%r10)
 	ceb	%f6,4095(%r5,%r10)
 	cebr	%f6,%f9
-	cefbr	%r6,%f9
-	cefr	%r6,%f9
+	cefbr	%f6,%r9
+	cefr	%f6,%r9
 	cer	%f6,%f9
 	cfc	4095(%r5)
 	cfdbr	%r6,5,%f9
@@ -125,8 +125,8 @@ foo:
 	cvb	%r6,4095(%r5,%r10)
 	cvd	%r6,4095(%r5,%r10)
 	cxbr	%f6,%f9
-	cxfbr	%r6,%f9
-	cxfr	%r6,%f9
+	cxfbr	%f6,%r9
+	cxfr	%f6,%r9
 	cxr	%f6,%f9
 	d	%r6,4095(%r5,%r10)
 	dd	%f6,4095(%r5,%r10)
@@ -143,7 +143,7 @@ foo:
 	dp	4095(6,%r5),4095(9,%r10)
 	dr	%r6,%r9
 	dxbr	%f6,%f9
-	dxr	%f6
+	dxr	%f6,%f9
 	ear	%r6,%a9
 	ed	4095(256,%r5),4095(%r10)
 	edmk	4095(256,%r5),4095(%r10)
@@ -154,11 +154,11 @@ foo:
 	esta	%r6,%r9
 	ex	%r6,4095(%r5,%r10)
 	fidbr	%f6,5,%f9
-	fidr	%f6,5,%f9
+	fidr	%f6,%f9
 	fiebr	%f6,5,%f9
-	fier	%f6,5,%f9
+	fier	%f6,%f9
 	fixbr	%f6,5,%f9
-	fixr	%f6,5,%f9
+	fixr	%f6,%f9
 	hdr	%f6,%f9
 	her	%f6,%f9
 	hsch	
@@ -263,9 +263,9 @@ foo:
 	lxebr	%f6,%f9
 	lxer	%f6,%f9
 	lxr	%r6,%r9
-	lzdr	%r6
-	lzer	%r6
-	lzxr	%r6
+	lzdr	%f6
+	lzer	%f6
+	lzxr	%f6
 	m	%r6,4095(%r5,%r10)
 	madb	%f6,%f9,4095(%r5,%r10)
 	madbr	%f6,%f9,%f5
@@ -380,11 +380,11 @@ foo:
 	spx	4095(%r5)
 	sqdb	%f6,4095(%r5,%r10)
 	sqdbr	%f6,%f9
-	sqdr	%f6
+	sqdr	%f6,%f9
 	sqe	%f6,4095(%r5,%r10)
 	sqeb	%f6,4095(%r5,%r10)
 	sqebr	%f6,%f9
-	sqer	%f6
+	sqer	%f6,%f9
 	sqxbr	%f6,%f9
 	sqxr	%f6,%f9
 	sr	%r6,%r9
@@ -444,7 +444,7 @@ foo:
 	tml	%r6,65535
 	tmlh	%r6,65535
 	tmll	%r6,65535
-	tp	%r6,4095(%r5)
+	tp	4095(6,%r5)
 	tpi	4095(%r5)
 	tprot	4095(%r5),4095(%r10)
 	tr	4095(256,%r5),4095(%r10)
diff --git a/gas/testsuite/gas/s390/zarch-z9-109.d b/gas/testsuite/gas/s390/zarch-z9-109.d
index 1fce287..580a039 100644
--- a/gas/testsuite/gas/s390/zarch-z9-109.d
+++ b/gas/testsuite/gas/s390/zarch-z9-109.d
@@ -47,8 +47,8 @@ Disassembly of section .text:
 .*:	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 f0 69 [	 ]*cu42	%r6,%r9,15
-.*:	b9 b2 f0 69 [	 ]*cu41	%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
 .*:	b3 3b 60 95 [	 ]*myr	%f6,%f9,%f5
diff --git a/gas/testsuite/gas/s390/zarch-z9-109.s b/gas/testsuite/gas/s390/zarch-z9-109.s
index 1c56cb3..6caf3aa 100644
--- a/gas/testsuite/gas/s390/zarch-z9-109.s
+++ b/gas/testsuite/gas/s390/zarch-z9-109.s
@@ -41,8 +41,8 @@ foo:
 	sske	%r6,%r9,15
 	cu24	%r6,%r9,15
 	cu21	%r6,%r9,15
-	cu42	%r6,%r9,15
-	cu41	%r6,%r9,15
+	cu42	%r6,%r9
+	cu41	%r6,%r9
 	cu12	%r6,%r9,15
 	cu14	%r6,%r9,15
 	myr	%f6,%f9,%f5
diff --git a/gas/testsuite/gas/s390/zarch-z900.d b/gas/testsuite/gas/s390/zarch-z900.d
index dc21077..d9f4785 100644
--- a/gas/testsuite/gas/s390/zarch-z900.d
+++ b/gas/testsuite/gas/s390/zarch-z900.d
@@ -24,11 +24,11 @@ Disassembly of section .text:
 .*:	ec 96 00 00 00 45 [ 	]*brxlg	%r9,%r6,4a <foo\+0x4a>
 .*:	eb 96 5f ff 00 44 [ 	]*bxhg	%r9,%r6,4095\(%r5\)
 .*:	eb 96 5f ff 00 45 [ 	]*bxleg	%r9,%r6,4095\(%r5\)
-.*:	b3 a5 00 96 [ 	]*cdgbr	%r9,%r6
-.*:	b3 c5 00 96 [ 	]*cdgr	%r9,%r6
+.*:	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\)
-.*:	b3 a4 00 96 [ 	]*cegbr	%r9,%r6
-.*:	b3 c4 00 96 [ 	]*cegr	%r9,%r6
+.*:	b3 a4 00 96 [ 	]*cegbr	%f9,%r6
+.*:	b3 c4 00 96 [ 	]*cegr	%f9,%r6
 .*:	b3 b9 90 65 [	 ]*cfdr	%r6,9,%f5
 .*:	b3 b8 90 65 [	 ]*cfer	%r6,9,%f5
 .*:	b3 ba 90 65 [	 ]*cfxr	%r6,9,%f5
@@ -51,8 +51,8 @@ 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	%r9,%r6
-.*:	b3 c6 00 96 [ 	]*cxgr	%r9,%r6
+.*:	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\)
diff --git a/gas/testsuite/gas/s390/zarch-z900.s b/gas/testsuite/gas/s390/zarch-z900.s
index 688033a..3251701 100644
--- a/gas/testsuite/gas/s390/zarch-z900.s
+++ b/gas/testsuite/gas/s390/zarch-z900.s
@@ -18,11 +18,11 @@ foo:
 	brxlg	%r9,%r6,.
 	bxhg	%r9,%r6,4095(%r5)
 	bxleg	%r9,%r6,4095(%r5)
-	cdgbr	%r9,%r6
-	cdgr	%r9,%r6
+	cdgbr	%f9,%r6
+	cdgr	%f9,%r6
 	cdsg	%r9,%r6,4095(%r5)
-	cegbr	%r9,%r6
-	cegr	%r9,%r6
+	cegbr	%f9,%r6
+	cegr	%f9,%r6
 	cfdr	%r6,9,%f5
 	cfer	%r6,9,%f5
 	cfxr	%r6,9,%f5
@@ -45,8 +45,8 @@ foo:
 	csg	%r9,%r6,4095(%r5)
 	cvbg	%r9,4095(%r5,%r10)
 	cvdg	%r9,4095(%r5,%r10)
-	cxgbr	%r9,%r6
-	cxgr	%r9,%r6
+	cxgbr	%f9,%r6
+	cxgr	%f9,%r6
 	dlg	%r9,4095(%r5,%r10)
 	dlgr	%r9,%r6
 	dsg	%r9,4095(%r5,%r10)