2010-09-27 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>

	* s390-mkopc.c (enum s390_opcde_cpu_val): Add S390_OPCODE_Z196.
	(main): Recognize the new CPU string.
	* s390-opc.c: Add new instruction formats and masks.
	* s390-opc.txt: Add new z196 instructions.

2010-09-27  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* opcode/s390.h: Add S390_OPCODE_Z196 to enum s390_opcode_cpu_val.

2010-09-27  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* config/tc-s390.c: (md_parse_option): New option -march=z196.
	* doc/c-s390.texi: Document new option.

2010-09-27  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* gas/s390/s390.exp: Run the zarch-z196 test.
	* gas/s390/zarch-z196.d: Add new instructions.
	* gas/s390/zarch-z196.s: Likewise.
	* gas/s390/zarch-z9-109.d: Likewise.
	* gas/s390/zarch-z9-109.s: Likewise.

9 files changed, 537 insertions, 3 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b9d7363..55a2202 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-27  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* config/tc-s390.c: (md_parse_option): New option -march=z196.
+	* doc/c-s390.texi: Document new option.
+
 2010-09-27  Tejas Belagod  <tejas.belagod@arm.com>
 
 	* config/tc-arm.c (do_neon_ldr_str): Deprecate ARM-mode PC-relative
diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 0b49312..cf9f8a1 100644
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -399,6 +399,8 @@ md_parse_option (int c, char *arg)
 	    current_cpu = S390_OPCODE_Z9_EC;
 	  else if (strcmp (arg + 5, "z10") == 0)
 	    current_cpu = S390_OPCODE_Z10;
+	  else if (strcmp (arg + 5, "z196") == 0)
+	    current_cpu = S390_OPCODE_Z196;
 	  else
 	    {
 	      as_bad (_("invalid switch -m%s"), arg);
diff --git a/gas/doc/c-s390.texi b/gas/doc/c-s390.texi
index 9408cb2..ab15312 100644
--- a/gas/doc/c-s390.texi
+++ b/gas/doc/c-s390.texi
@@ -17,7 +17,7 @@
 The s390 version of @code{@value{AS}} supports two architectures modes
 and seven chip levels. The architecture modes are the Enterprise System
 Architecture (ESA) and the newer z/Architecture mode. The chip levels
-are g5, g6, z900, z990, z9-109, z9-ec and z10.
+are g5, g6, z900, z990, z9-109, z9-ec, z10 and z196.
 
 @menu
 * s390 Options::                Command-line Options.
@@ -64,8 +64,9 @@ are recognized:
 @code{z900},
 @code{z990},
 @code{z9-109},
-@code{z9-ec} and
-@code{z10}.
+@code{z9-ec},
+@code{z10} and
+@code{z196}.
 Assembling an instruction that is not supported on the target processor
 results in an error message. Do not specify @code{g5} or @code{g6}
 with @samp{-mzarch}.
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 1fdb02d..3c8f2c5 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,13 @@
 2010-09-27  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
+	* gas/s390/s390.exp: Run the zarch-z196 test.
+	* gas/s390/zarch-z196.d: Add new instructions.
+	* gas/s390/zarch-z196.s: Likewise.
+	* gas/s390/zarch-z9-109.d: Likewise.
+	* gas/s390/zarch-z9-109.s: Likewise.
+
+2010-09-27  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
 	* gas/s390/esa-g5.d: Adjust serveral instructions.
 	* gas/s390/esa-reloc.d: Likewise.
 	* gas/s390/esa-z990.d: Likewise.
diff --git a/gas/testsuite/gas/s390/s390.exp b/gas/testsuite/gas/s390/s390.exp
index fae071c..ec9805d 100644
--- a/gas/testsuite/gas/s390/s390.exp
+++ b/gas/testsuite/gas/s390/s390.exp
@@ -24,6 +24,7 @@ if [expr [istarget "s390-*-*"] ||  [istarget "s390x-*-*"]]  then {
     run_dump_test "zarch-z9-109" "{as -m64} {as -march=z9-109}"
     run_dump_test "zarch-z9-ec" "{as -m64} {as -march=z9-ec}"
     run_dump_test "zarch-z10" "{as -m64} {as -march=z10}"
+    run_dump_test "zarch-z196" "{as -m64} {as -march=z196}"
     run_dump_test "zarch-reloc" "{as -m64}"
     run_dump_test "zarch-operands" "{as -m64} {as -march=z9-109}"
 }
diff --git a/gas/testsuite/gas/s390/zarch-z196.d b/gas/testsuite/gas/s390/zarch-z196.d
new file mode 100644
index 0000000..a444cae
--- /dev/null
+++ b/gas/testsuite/gas/s390/zarch-z196.d
@@ -0,0 +1,255 @@
+#name: s390x opcode
+#objdump: -drw
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+.* <foo>:
+.*:	b9 c8 80 67 [ 	]*ahhhr	%r6,%r7,%r8
+.*:	b9 d8 80 67 [ 	]*ahhlr	%r6,%r7,%r8
+.*:	cc 68 ff ff 02 18 [ 	]*aih	%r6,-65000
+.*:	b9 ca 80 67 [ 	]*alhhhr	%r6,%r7,%r8
+.*:	b9 da 80 67 [ 	]*alhhlr	%r6,%r7,%r8
+.*:	cc 6a 00 00 fd e8 [ 	]*alsih	%r6,65000
+.*:	cc 6b 00 00 fd e8 [ 	]*alsihn	%r6,65000
+.*:	cc 66 00 00 00 00 [ 	]*brcth	%r6,22 <foo\+0x22>
+.*:	b9 cd 00 67 [ 	]*chhr	%r6,%r7
+.*:	b9 dd 00 67 [ 	]*chlr	%r6,%r7
+.*:	e3 67 85 b3 01 cd [ 	]*chf	%r6,5555\(%r7,%r8\)
+.*:	cc 6d 00 00 fd e8 [ 	]*cih	%r6,65000
+.*:	b9 cf 00 67 [ 	]*clhhr	%r6,%r7
+.*:	b9 df 00 67 [ 	]*clhlr	%r6,%r7
+.*:	e3 67 85 b3 01 cf [ 	]*clhf	%r6,5555\(%r7,%r8\)
+.*:	cc 6f 00 09 eb 10 [ 	]*clih	%r6,650000
+.*:	e3 67 8a 4d fe c0 [ 	]*lbh	%r6,-5555\(%r7,%r8\)
+.*:	e3 67 8a 4d fe c4 [ 	]*lhh	%r6,-5555\(%r7,%r8\)
+.*:	e3 67 8a 4d fe ca [ 	]*lfh	%r6,-5555\(%r7,%r8\)
+.*:	e3 67 8a 4d fe c2 [ 	]*llch	%r6,-5555\(%r7,%r8\)
+.*:	e3 67 8a 4d fe c6 [ 	]*llhh	%r6,-5555\(%r7,%r8\)
+.*:	ec 67 0c 0d 0e 5d [ 	]*risbhg	%r6,%r7,12,13,14
+.*:	ec 67 0c 0d 0e 51 [ 	]*risblg	%r6,%r7,12,13,14
+.*:	e3 67 8a 4d fe c3 [ 	]*stch	%r6,-5555\(%r7,%r8\)
+.*:	e3 67 8a 4d fe c7 [ 	]*sthh	%r6,-5555\(%r7,%r8\)
+.*:	e3 67 8a 4d fe cb [ 	]*stfh	%r6,-5555\(%r7,%r8\)
+.*:	b9 c9 80 67 [ 	]*shhhr	%r6,%r7,%r8
+.*:	b9 d9 80 67 [ 	]*shhlr	%r6,%r7,%r8
+.*:	b9 cb 80 67 [ 	]*slhhhr	%r6,%r7,%r8
+.*:	b9 db 80 67 [ 	]*slhhlr	%r6,%r7,%r8
+.*:	eb 67 8a 4d fe f8 [ 	]*laa	%r6,%r7,-5555\(%r8\)
+.*:	eb 67 8a 4d fe e8 [ 	]*laag	%r6,%r7,-5555\(%r8\)
+.*:	eb 67 8a 4d fe fa [ 	]*laal	%r6,%r7,-5555\(%r8\)
+.*:	eb 67 8a 4d fe ea [ 	]*laalg	%r6,%r7,-5555\(%r8\)
+.*:	eb 67 8a 4d fe f4 [ 	]*lan	%r6,%r7,-5555\(%r8\)
+.*:	eb 67 8a 4d fe e4 [ 	]*lang	%r6,%r7,-5555\(%r8\)
+.*:	eb 67 8a 4d fe f7 [ 	]*lax	%r6,%r7,-5555\(%r8\)
+.*:	eb 67 8a 4d fe e7 [ 	]*laxg	%r6,%r7,-5555\(%r8\)
+.*:	eb 67 8a 4d fe f6 [ 	]*lao	%r6,%r7,-5555\(%r8\)
+.*:	eb 67 8a 4d fe e6 [ 	]*laog	%r6,%r7,-5555\(%r8\)
+.*:	c8 64 78 ae 84 57 [ 	]*lpd	%r6,2222\(%r7\),1111\(%r8\)
+.*:	c8 65 78 ae 84 57 [ 	]*lpdg	%r6,2222\(%r7\),1111\(%r8\)
+.*:	b9 f2 10 67 [ 	]*locro	%r6,%r7
+.*:	b9 f2 20 67 [ 	]*locrh	%r6,%r7
+.*:	b9 f2 20 67 [ 	]*locrh	%r6,%r7
+.*:	b9 f2 30 67 [ 	]*locrnle	%r6,%r7
+.*:	b9 f2 40 67 [ 	]*locrl	%r6,%r7
+.*:	b9 f2 40 67 [ 	]*locrl	%r6,%r7
+.*:	b9 f2 50 67 [ 	]*locrnhe	%r6,%r7
+.*:	b9 f2 60 67 [ 	]*locrlh	%r6,%r7
+.*:	b9 f2 70 67 [ 	]*locrne	%r6,%r7
+.*:	b9 f2 70 67 [ 	]*locrne	%r6,%r7
+.*:	b9 f2 80 67 [ 	]*locre	%r6,%r7
+.*:	b9 f2 80 67 [ 	]*locre	%r6,%r7
+.*:	b9 f2 90 67 [ 	]*locrnlh	%r6,%r7
+.*:	b9 f2 a0 67 [ 	]*locrhe	%r6,%r7
+.*:	b9 f2 b0 67 [ 	]*locrnl	%r6,%r7
+.*:	b9 f2 b0 67 [ 	]*locrnl	%r6,%r7
+.*:	b9 f2 c0 67 [ 	]*locrle	%r6,%r7
+.*:	b9 f2 d0 67 [ 	]*locrnh	%r6,%r7
+.*:	b9 f2 d0 67 [ 	]*locrnh	%r6,%r7
+.*:	b9 f2 e0 67 [ 	]*locrno	%r6,%r7
+.*:	b9 f2 80 67 [ 	]*locre	%r6,%r7
+.*:	b9 e2 10 67 [ 	]*locgro	%r6,%r7
+.*:	b9 e2 20 67 [ 	]*locgrh	%r6,%r7
+.*:	b9 e2 20 67 [ 	]*locgrh	%r6,%r7
+.*:	b9 e2 30 67 [ 	]*locgrnle	%r6,%r7
+.*:	b9 e2 40 67 [ 	]*locgrl	%r6,%r7
+.*:	b9 e2 40 67 [ 	]*locgrl	%r6,%r7
+.*:	b9 e2 50 67 [ 	]*locgrnhe	%r6,%r7
+.*:	b9 e2 60 67 [ 	]*locgrlh	%r6,%r7
+.*:	b9 e2 70 67 [ 	]*locgrne	%r6,%r7
+.*:	b9 e2 70 67 [ 	]*locgrne	%r6,%r7
+.*:	b9 e2 80 67 [ 	]*locgre	%r6,%r7
+.*:	b9 e2 80 67 [ 	]*locgre	%r6,%r7
+.*:	b9 e2 90 67 [ 	]*locgrnlh	%r6,%r7
+.*:	b9 e2 a0 67 [ 	]*locgrhe	%r6,%r7
+.*:	b9 e2 b0 67 [ 	]*locgrnl	%r6,%r7
+.*:	b9 e2 b0 67 [ 	]*locgrnl	%r6,%r7
+.*:	b9 e2 c0 67 [ 	]*locgrle	%r6,%r7
+.*:	b9 e2 d0 67 [ 	]*locgrnh	%r6,%r7
+.*:	b9 e2 d0 67 [ 	]*locgrnh	%r6,%r7
+.*:	b9 e2 e0 67 [ 	]*locgrno	%r6,%r7
+.*:	b9 e2 80 67 [ 	]*locgre	%r6,%r7
+.*:	eb 61 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),1
+.*:	eb 62 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),2
+.*:	eb 62 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),2
+.*:	eb 63 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),3
+.*:	eb 64 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),4
+.*:	eb 64 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),4
+.*:	eb 65 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),5
+.*:	eb 66 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),6
+.*:	eb 67 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),7
+.*:	eb 67 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),7
+.*:	eb 68 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),8
+.*:	eb 68 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),8
+.*:	eb 69 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),9
+.*:	eb 6a 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),10
+.*:	eb 6b 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),11
+.*:	eb 6b 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),11
+.*:	eb 6c 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),12
+.*:	eb 6d 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),13
+.*:	eb 6d 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),13
+.*:	eb 6e 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),14
+.*:	eb 68 7a 4d fe f2 [ 	]*loc	%r6,-5555\(%r7\),8
+.*:	eb 61 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),1
+.*:	eb 62 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),2
+.*:	eb 62 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),2
+.*:	eb 63 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),3
+.*:	eb 64 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),4
+.*:	eb 64 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),4
+.*:	eb 65 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),5
+.*:	eb 66 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),6
+.*:	eb 67 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),7
+.*:	eb 67 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),7
+.*:	eb 68 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),8
+.*:	eb 68 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),8
+.*:	eb 69 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),9
+.*:	eb 6a 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),10
+.*:	eb 6b 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),11
+.*:	eb 6b 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),11
+.*:	eb 6c 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),12
+.*:	eb 6d 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),13
+.*:	eb 6d 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),13
+.*:	eb 6e 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),14
+.*:	eb 68 7a 4d fe e2 [ 	]*lgoc	%r6,-5555\(%r7\),8
+.*:	eb 61 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),1
+.*:	eb 62 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),2
+.*:	eb 62 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),2
+.*:	eb 63 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),3
+.*:	eb 64 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),4
+.*:	eb 64 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),4
+.*:	eb 65 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),5
+.*:	eb 66 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),6
+.*:	eb 67 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),7
+.*:	eb 67 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),7
+.*:	eb 68 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),8
+.*:	eb 68 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),8
+.*:	eb 69 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),9
+.*:	eb 6a 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),10
+.*:	eb 6b 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),11
+.*:	eb 6b 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),11
+.*:	eb 6c 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),12
+.*:	eb 6d 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),13
+.*:	eb 6d 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),13
+.*:	eb 6e 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),14
+.*:	eb 68 7a 4d fe f3 [ 	]*stoc	%r6,-5555\(%r7\),8
+.*:	eb 61 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),1
+.*:	eb 62 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),2
+.*:	eb 62 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),2
+.*:	eb 63 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),3
+.*:	eb 64 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),4
+.*:	eb 64 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),4
+.*:	eb 65 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),5
+.*:	eb 66 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),6
+.*:	eb 67 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),7
+.*:	eb 67 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),7
+.*:	eb 68 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),8
+.*:	eb 68 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),8
+.*:	eb 69 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),9
+.*:	eb 6a 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),10
+.*:	eb 6b 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),11
+.*:	eb 6b 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),11
+.*:	eb 6c 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),12
+.*:	eb 6d 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),13
+.*:	eb 6d 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),13
+.*:	eb 6e 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),14
+.*:	eb 68 7a 4d fe e3 [ 	]*stgoc	%r6,-5555\(%r7\),8
+.*:	b9 f8 80 67 [ 	]*ark	%r6,%r7,%r8
+.*:	b9 e8 80 67 [ 	]*agrk	%r6,%r7,%r8
+.*:	ec 67 83 00 00 d8 [ 	]*ahik	%r6,%r7,-32000
+.*:	ec 67 83 00 00 d9 [ 	]*aghik	%r6,%r7,-32000
+.*:	b9 fa 80 67 [ 	]*alrk	%r6,%r7,%r8
+.*:	b9 ea 80 67 [ 	]*algrk	%r6,%r7,%r8
+.*:	ec 67 83 00 00 da [ 	]*alhsik	%r6,%r7,-32000
+.*:	ec 67 83 00 00 db [ 	]*alghsik	%r6,%r7,-32000
+.*:	b9 f4 80 67 [ 	]*nrk	%r6,%r7,%r8
+.*:	b9 e4 80 67 [ 	]*ngrk	%r6,%r7,%r8
+.*:	b9 f7 80 67 [ 	]*xrk	%r6,%r7,%r8
+.*:	b9 e7 80 67 [ 	]*xgrk	%r6,%r7,%r8
+.*:	b9 f6 80 67 [ 	]*ork	%r6,%r7,%r8
+.*:	b9 e6 80 67 [ 	]*ogrk	%r6,%r7,%r8
+.*:	eb 67 8a 4d fe dd [ 	]*slak	%r6,%r7,-5555\(%r8\)
+.*:	eb 67 8a 4d fe df [ 	]*sllk	%r6,%r7,-5555\(%r8\)
+.*:	eb 67 8a 4d fe dc [ 	]*srak	%r6,%r7,-5555\(%r8\)
+.*:	eb 67 8a 4d fe de [ 	]*srlk	%r6,%r7,-5555\(%r8\)
+.*:	b9 f9 80 67 [ 	]*srk	%r6,%r7,%r8
+.*:	b9 e9 80 67 [ 	]*sgrk	%r6,%r7,%r8
+.*:	b9 fb 80 67 [ 	]*slrk	%r6,%r7,%r8
+.*:	b9 eb 80 67 [ 	]*slgrk	%r6,%r7,%r8
+.*:	b9 e1 00 67 [ 	]*popcnt	%r6,%r7
+.*:	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 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 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 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 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 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 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 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 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 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 d2 97 35 [ 	]*adtra	%f3,%f5,%f9,7
+.*:	b3 da 97 35 [ 	]*axtra	%f3,%f5,%f9,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 52 37 59 [ 	]*cdlgtr	%f5,3,%r9,7
+.*:	b9 5a 37 59 [ 	]*cxlgtr	%f5,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
+.*:	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 43 37 59 [ 	]*clfdtr	%r5,3,%f9,7
+.*:	b9 4b 37 59 [ 	]*clfxtr	%r5,3,%f9,7
+.*:	b3 d1 97 35 [ 	]*ddtra	%f3,%f5,%f9,7
+.*:	b3 d9 97 35 [ 	]*dxtra	%f3,%f5,%f9,7
+.*:	b3 d0 97 35 [ 	]*mdtra	%f3,%f5,%f9,7
+.*:	b3 d8 97 35 [ 	]*mxtra	%f3,%f5,%f9,7
+.*:	b3 d3 97 35 [ 	]*sdtra	%f3,%f5,%f9,7
+.*:	b3 db 97 35 [ 	]*sxtra	%f3,%f5,%f9,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
new file mode 100644
index 0000000..0085819
--- /dev/null
+++ b/gas/testsuite/gas/s390/zarch-z196.s
@@ -0,0 +1,257 @@
+.text
+foo:
+	ahhhr	%r6,%r7,%r8
+	ahhlr	%r6,%r7,%r8
+	aih	%r6,-65000
+	alhhhr	%r6,%r7,%r8
+	alhhlr	%r6,%r7,%r8
+	alsih	%r6,65000
+	alsihn	%r6,65000
+	brcth	%r6,.
+	chhr	%r6,%r7
+	chlr	%r6,%r7
+	chf	%r6,5555(%r7,%r8)
+	cih	%r6,65000
+	clhhr	%r6,%r7
+	clhlr	%r6,%r7
+	clhf	%r6,5555(%r7,%r8)
+	clih	%r6,650000
+	lbh	%r6,-5555(%r7,%r8)
+	lhh	%r6,-5555(%r7,%r8)
+	lfh	%r6,-5555(%r7,%r8)
+	llch	%r6,-5555(%r7,%r8)
+	llhh	%r6,-5555(%r7,%r8)
+	risbhg	%r6,%r7,12,13,14
+	risblg	%r6,%r7,12,13,14
+	stch	%r6,-5555(%r7,%r8)
+	sthh	%r6,-5555(%r7,%r8)
+	stfh	%r6,-5555(%r7,%r8)
+	shhhr	%r6,%r7,%r8
+	shhlr	%r6,%r7,%r8
+	slhhhr	%r6,%r7,%r8
+	slhhlr	%r6,%r7,%r8
+	laa	%r6,%r7,-5555(%r8)
+	laag	%r6,%r7,-5555(%r8)
+	laal	%r6,%r7,-5555(%r8)
+	laalg	%r6,%r7,-5555(%r8)
+	lan	%r6,%r7,-5555(%r8)
+	lang	%r6,%r7,-5555(%r8)
+	lax	%r6,%r7,-5555(%r8)
+	laxg	%r6,%r7,-5555(%r8)
+	lao	%r6,%r7,-5555(%r8)
+	laog	%r6,%r7,-5555(%r8)
+	lpd	%r6,2222(%r7),1111(%r8)
+	lpdg	%r6,2222(%r7),1111(%r8)
+
+	locro	%r6,%r7
+	locrh	%r6,%r7
+	locrp	%r6,%r7
+	locrnle	%r6,%r7
+	locrl	%r6,%r7
+	locrm	%r6,%r7
+	locrnhe	%r6,%r7
+	locrlh	%r6,%r7
+	locrne	%r6,%r7
+	locrnz	%r6,%r7
+	locre	%r6,%r7
+	locrz	%r6,%r7
+	locrnlh	%r6,%r7
+	locrhe	%r6,%r7
+	locrnl	%r6,%r7
+	locrnm	%r6,%r7
+	locrle	%r6,%r7
+	locrnh	%r6,%r7
+	locrnp	%r6,%r7
+	locrno	%r6,%r7
+	locr	%r6,%r7,8
+
+	locgro	%r6,%r7
+	locgrh	%r6,%r7
+	locgrp	%r6,%r7
+	locgrnle %r6,%r7
+	locgrl	%r6,%r7
+	locgrm	%r6,%r7
+	locgrnhe %r6,%r7
+	locgrlh	%r6,%r7
+	locgrne	%r6,%r7
+	locgrnz	%r6,%r7
+	locgre	%r6,%r7
+	locgrz	%r6,%r7
+	locgrnlh %r6,%r7
+	locgrhe	%r6,%r7
+	locgrnl	%r6,%r7
+	locgrnm	%r6,%r7
+	locgrle	%r6,%r7
+	locgrnh	%r6,%r7
+	locgrnp	%r6,%r7
+	locgrno	%r6,%r7
+	locgr	%r6,%r7,8
+
+	loco	%r6,-5555(%r7)
+	loch	%r6,-5555(%r7)
+	locp	%r6,-5555(%r7)
+	locnle	%r6,-5555(%r7)
+	locl	%r6,-5555(%r7)
+	locm	%r6,-5555(%r7)
+	locnhe	%r6,-5555(%r7)
+	loclh	%r6,-5555(%r7)
+	locne	%r6,-5555(%r7)
+	locnz	%r6,-5555(%r7)
+	loce	%r6,-5555(%r7)
+	locz	%r6,-5555(%r7)
+	locnlh	%r6,-5555(%r7)
+	loche	%r6,-5555(%r7)
+	locnl	%r6,-5555(%r7)
+	locnm	%r6,-5555(%r7)
+	locle	%r6,-5555(%r7)
+	locnh	%r6,-5555(%r7)
+	locnp	%r6,-5555(%r7)
+	locno	%r6,-5555(%r7)
+	loc	%r6,-5555(%r7),8
+
+	lgoco	%r6,-5555(%r7)
+	lgoch	%r6,-5555(%r7)
+	lgocp	%r6,-5555(%r7)
+	lgocnle	%r6,-5555(%r7)
+	lgocl	%r6,-5555(%r7)
+	lgocm	%r6,-5555(%r7)
+	lgocnhe	%r6,-5555(%r7)
+	lgoclh	%r6,-5555(%r7)
+	lgocne	%r6,-5555(%r7)
+	lgocnz	%r6,-5555(%r7)
+	lgoce	%r6,-5555(%r7)
+	lgocz	%r6,-5555(%r7)
+	lgocnlh	%r6,-5555(%r7)
+	lgoche	%r6,-5555(%r7)
+	lgocnl	%r6,-5555(%r7)
+	lgocnm	%r6,-5555(%r7)
+	lgocle	%r6,-5555(%r7)
+	lgocnh	%r6,-5555(%r7)
+	lgocnp	%r6,-5555(%r7)
+	lgocno	%r6,-5555(%r7)
+	lgoc	%r6,-5555(%r7),8
+
+	stoco	%r6,-5555(%r7)
+	stoch	%r6,-5555(%r7)
+	stocp	%r6,-5555(%r7)
+	stocnle	%r6,-5555(%r7)
+	stocl	%r6,-5555(%r7)
+	stocm	%r6,-5555(%r7)
+	stocnhe	%r6,-5555(%r7)
+	stoclh	%r6,-5555(%r7)
+	stocne	%r6,-5555(%r7)
+	stocnz	%r6,-5555(%r7)
+	stoce	%r6,-5555(%r7)
+	stocz	%r6,-5555(%r7)
+	stocnlh	%r6,-5555(%r7)
+	stoche	%r6,-5555(%r7)
+	stocnl	%r6,-5555(%r7)
+	stocnm	%r6,-5555(%r7)
+	stocle	%r6,-5555(%r7)
+	stocnh	%r6,-5555(%r7)
+	stocnp	%r6,-5555(%r7)
+	stocno	%r6,-5555(%r7)
+	stoc	%r6,-5555(%r7),8
+
+	stgoco	%r6,-5555(%r7)
+	stgoch	%r6,-5555(%r7)
+	stgocp	%r6,-5555(%r7)
+	stgocnle %r6,-5555(%r7)
+	stgocl	%r6,-5555(%r7)
+	stgocm	%r6,-5555(%r7)
+	stgocnhe %r6,-5555(%r7)
+	stgoclh	%r6,-5555(%r7)
+	stgocne	%r6,-5555(%r7)
+	stgocnz	%r6,-5555(%r7)
+	stgoce	%r6,-5555(%r7)
+	stgocz	%r6,-5555(%r7)
+	stgocnlh %r6,-5555(%r7)
+	stgoche	%r6,-5555(%r7)
+	stgocnl	%r6,-5555(%r7)
+	stgocnm	%r6,-5555(%r7)
+	stgocle	%r6,-5555(%r7)
+	stgocnh	%r6,-5555(%r7)
+	stgocnp	%r6,-5555(%r7)
+	stgocno	%r6,-5555(%r7)
+	stgoc	%r6,-5555(%r7),8
+
+	ark	%r6,%r7,%r8
+	agrk	%r6,%r7,%r8
+	ahik	%r6,%r7,-32000
+	aghik	%r6,%r7,-32000
+	alrk	%r6,%r7,%r8
+	algrk	%r6,%r7,%r8
+	alhsik	%r6,%r7,-32000
+	alghsik	%r6,%r7,-32000
+	nrk	%r6,%r7,%r8
+	ngrk	%r6,%r7,%r8
+	xrk	%r6,%r7,%r8
+	xgrk	%r6,%r7,%r8
+	ork	%r6,%r7,%r8
+	ogrk	%r6,%r7,%r8
+	slak	%r6,%r7,-5555(%r8)
+	sllk	%r6,%r7,-5555(%r8)
+	srak	%r6,%r7,-5555(%r8)
+	srlk	%r6,%r7,-5555(%r8)
+	srk	%r6,%r7,%r8
+	sgrk	%r6,%r7,%r8
+	slrk	%r6,%r7,%r8
+	slgrk	%r6,%r7,%r8
+	popcnt	%r6,%r7
+	rrbm	%r6,%r7
+
+	cefbra %f5,3,%r9,7
+	cdfbra %f5,3,%r9,7
+	cxfbra %f5,3,%r9,7
+	cegbra %f5,3,%r9,7
+	cdgbra %f5,3,%r9,7
+	cxgbra %f5,3,%r9,7
+	celfbr %f5,3,%r9,7
+	cdlfbr %f5,3,%r9,7
+	cxlfbr %f5,3,%r9,7
+	celgbr %f5,3,%r9,7
+	cdlgbr %f5,3,%r9,7
+	cxlgbr %f5,3,%r9,7
+	cfebra %r5,3,%f9,7
+	cfdbra %r5,3,%f9,7
+	cfxbra %r5,3,%f9,7
+	cgebra %r5,3,%f9,7
+	cgdbra %r5,3,%f9,7
+	cgxbra %r5,3,%f9,7
+	clfebr %r5,3,%f9,7
+	clfdbr %r5,3,%f9,7
+	clfxbr %r5,3,%f9,7
+	clgebr %r5,3,%f9,7
+	clgdbr %r5,3,%f9,7
+	clgxbr %r5,3,%f9,7
+	fiebra %f5,3,%f9,7
+	fidbra %f5,3,%f9,7
+	fixbra %f5,3,%f9,7
+	ledbra %f5,3,%f9,7
+	ldxbra %f5,3,%f9,7
+	lexbra %f5,3,%f9,7
+	adtra %f3,%f5,%f9,7
+	axtra %f3,%f5,%f9,7
+	cdgtra %f5,3,%r9,7
+	cdftr %f5,3,%r9,7
+	cxftr %f5,3,%r9,7
+	cxgtra %f5,3,%r9,7
+	cdlgtr %f5,3,%r9,7
+	cxlgtr %f5,3,%r9,7
+	cdlftr %f5,3,%r9,7
+	cxlftr %f5,3,%r9,7
+	cgdtra %r5,3,%f9,7
+	cgxtra %r5,3,%f9,7
+	cfdtr %r5,3,%f9,7
+	cfxtr %r5,3,%f9,7
+	clgdtr %r5,3,%f9,7
+	clgxtr %r5,3,%f9,7
+	clfdtr %r5,3,%f9,7
+	clfxtr %r5,3,%f9,7
+	ddtra %f3,%f5,%f9,7
+	dxtra %f3,%f5,%f9,7
+	mdtra %f3,%f5,%f9,7
+	mxtra %f3,%f5,%f9,7
+	sdtra %f3,%f5,%f9,7
+	sxtra %f3,%f5,%f9,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 580a039..7c5797d 100644
--- a/gas/testsuite/gas/s390/zarch-z9-109.d
+++ b/gas/testsuite/gas/s390/zarch-z9-109.d
@@ -63,3 +63,6 @@ Disassembly of section .text:
 .*:	ed 95 af ff 60 3a [	 ]*may	%f6,%f9,4095\(%r5,%r10\)
 .*:	ed 95 af ff 60 3c [	 ]*mayh	%f6,%f9,4095\(%r5,%r10\)
 .*:	ed 95 af ff 60 38 [	 ]*mayl	%f6,%f9,4095\(%r5,%r10\)
+.*:	b9 eb 00 67 [	 ]*srstu	%r6,%r7
+.*:	d0 16 5f ff ad 05 [	 ]*trtr	4095\(23,%r5\),3333\(%r10\)
+.*:	07 07 [ 	]*nopr	%r7
\ No newline at end of file
diff --git a/gas/testsuite/gas/s390/zarch-z9-109.s b/gas/testsuite/gas/s390/zarch-z9-109.s
index 6caf3aa..35f1140 100644
--- a/gas/testsuite/gas/s390/zarch-z9-109.s
+++ b/gas/testsuite/gas/s390/zarch-z9-109.s
@@ -57,3 +57,5 @@ foo:
 	may	%f6,%f9,4095(%r5,%r10)
 	mayh	%f6,%f9,4095(%r5,%r10)
 	mayl	%f6,%f9,4095(%r5,%r10)
+	srstu	%r6,%r7
+	trtr	4095(23,%r5),3333(%r10)