2007-03-06 Andreas Krebbel <krebbel1@de.ibm.com>

	* opcodes/s390-opc.c (INSTR_RRE_FR, INSTR_RRF_F0FF2, INSTR_RRF_F0FR,
	INSTR_RRF_UUFF, INSTR_RRF_0UFF, INSTR_RRF_FFFU,	INSTR_RRR_F0FF): New
	instruction formats added.
	(MASK_RRE_FR, MASK_RRF_F0FF2, MASK_RRF_F0FR, MASK_RRF_UUFF,
	MASK_RRF_0UFF, MASK_RRF_FFFU, MASK_RRR_F0FF): New instruction format
	masks added.
	* opcodes/s390-opc.txt (lpdfr - tgxt): Decimal floating point
	instructions added.
	* opcodes/s390-mkopc.c (s390_opcode_cpu_val): S390_OPCODE_Z9_EC added.
	(main): z9-ec cpu type option added.
	* include/opcode/s390.h (s390_opcode_cpu_val): S390_OPCODE_Z9_EC added.

2007-03-06  Andreas Krebbel  <krebbel1@de.ibm.com>

	* config/tc-s390.c (md_parse_option): z9-ec option added.

2007-03-06  Andreas Krebbel  <krebbel1@de.ibm.com>

	* gas/s390/zarch-z9-ec.d: New file.
	* gas/s390/zarch-z9-ec.s: New file.
	* gas/s390/s390.exp: Run the z9-ec testcases.

6 files changed, 149 insertions, 0 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 289d1ce..dde64e6 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-06  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+	* config/tc-s390.c (md_parse_option): z9-ec option added.
+
 2007-03-02  Paul Brook  <paul@codesourcery.com>
 
 	* config/tc-arm.c (relax_immediate): Always return positive values.
diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 463cde7..6ca31f7 100644
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -411,6 +411,8 @@ md_parse_option (c, arg)
 	    current_cpu = S390_OPCODE_Z990;
 	  else if (strcmp (arg + 5, "z9-109") == 0)
 	    current_cpu = S390_OPCODE_Z9_109;
+	  else if (strcmp (arg + 5, "z9-ec") == 0)
+	    current_cpu = S390_OPCODE_Z9_EC;
 	  else
 	    {
 	      as_bad (_("invalid switch -m%s"), arg);
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 57ac6ec..4e483b1 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-06  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+	* gas/s390/zarch-z9-ec.d: New file.
+	* gas/s390/zarch-z9-ec.s: New file.
+	* gas/s390/s390.exp: Run the z9-ec testcases.
+
 2007-03-05  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gas/3918
diff --git a/gas/testsuite/gas/s390/s390.exp b/gas/testsuite/gas/s390/s390.exp
index 3d9a4a1..db49134 100644
--- a/gas/testsuite/gas/s390/s390.exp
+++ b/gas/testsuite/gas/s390/s390.exp
@@ -32,6 +32,7 @@ if [expr [istarget "s390-*-*"] ||  [istarget "s390x-*-*"]]  then {
     run_dump_test "zarch-z900" "{as -m64}"
     run_dump_test "zarch-z990" "{as -m64} {as -march=z990}"
     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-reloc" "{as -m64}"
     run_dump_test "zarch-operands" "{as -m64} {as -march=z9-109}"
 }
diff --git a/gas/testsuite/gas/s390/zarch-z9-ec.d b/gas/testsuite/gas/s390/zarch-z9-ec.d
new file mode 100644
index 0000000..f2bb0bf
--- /dev/null
+++ b/gas/testsuite/gas/s390/zarch-z9-ec.d
@@ -0,0 +1,71 @@
+#name: s390x opcode
+#objdump: -drw
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+.* <foo>:
+.*:	b3 70 00 62 [	 ]*lpdfr	%f6,%f2
+.*:	b3 71 00 62 [	 ]*lndfr	%f6,%f2
+.*:	b3 72 10 62 [	 ]*cpsdr	%f6,%f1,%f2
+.*:	b3 73 00 62 [	 ]*lcdfr	%f6,%f2
+.*:	b3 c1 00 62 [	 ]*ldgr	%f6,%r2
+.*:	b3 cd 00 26 [	 ]*lgdr	%r2,%f6
+.*:	b3 d2 40 62 [	 ]*adtr	%f6,%f2,%f4
+.*:	b3 da 40 62 [	 ]*axtr	%f6,%f2,%f4
+.*:	b3 e4 00 62 [	 ]*cdtr	%f6,%f2
+.*:	b3 ec 00 62 [	 ]*cxtr	%f6,%f2
+.*:	b3 e0 00 62 [	 ]*kdtr	%f6,%f2
+.*:	b3 e8 00 62 [	 ]*kxtr	%f6,%f2
+.*:	b3 f4 00 62 [	 ]*cedtr	%f6,%f2
+.*:	b3 fc 00 62 [	 ]*cextr	%f6,%f2
+.*:	b3 f1 00 62 [	 ]*cdgtr	%f6,%r2
+.*:	b3 f9 00 62 [	 ]*cxgtr	%f6,%r2
+.*:	b3 f3 00 62 [	 ]*cdstr	%f6,%r2
+.*:	b3 fb 00 62 [	 ]*cxstr	%f6,%r2
+.*:	b3 f2 00 62 [	 ]*cdutr	%f6,%r2
+.*:	b3 fa 00 62 [	 ]*cxutr	%f6,%r2
+.*:	b3 e1 10 26 [	 ]*cgdtr	%r2,1,%f6
+.*:	b3 e9 10 26 [	 ]*cgxtr	%r2,1,%f6
+.*:	b3 e3 00 26 [	 ]*csdtr	%r2,%f6
+.*:	b3 eb 00 26 [	 ]*csxtr	%r2,%f6
+.*:	b3 e2 00 26 [	 ]*cudtr	%r2,%f6
+.*:	b3 ea 00 26 [	 ]*cuxtr	%r2,%f6
+.*:	b3 d1 40 62 [	 ]*ddtr	%f6,%f2,%f4
+.*:	b3 d9 40 62 [	 ]*dxtr	%f6,%f2,%f4
+.*:	b3 e5 00 26 [	 ]*eedtr	%r2,%f6
+.*:	b3 ed 00 26 [	 ]*eextr	%r2,%f6
+.*:	b3 e7 00 26 [	 ]*esdtr	%r2,%f6
+.*:	b3 ef 00 26 [	 ]*esxtr	%r2,%f6
+.*:	b3 f6 20 64 [	 ]*iedtr	%f6,%f2,%r4
+.*:	b3 fe 20 64 [	 ]*iextr	%f6,%f2,%r4
+.*:	b3 d6 00 62 [	 ]*ltdtr	%f6,%f2
+.*:	b3 de 00 62 [	 ]*ltxtr	%f6,%f2
+.*:	b3 d7 13 62 [	 ]*fidtr	%f6,1,%f2,3
+.*:	b3 df 13 62 [	 ]*fixtr	%f6,1,%f2,3
+.*:	b2 bd 10 03 [	 ]*lfas	3\(%r1\)
+.*:	b3 d4 01 62 [	 ]*ldetr	%f6,%f2,1
+.*:	b3 dc 01 62 [	 ]*lxdtr	%f6,%f2,1
+.*:	b3 d5 13 62 [	 ]*ledtr	%f6,1,%f2,3
+.*:	b3 dd 13 62 [	 ]*ldxtr	%f6,1,%f2,3
+.*:	b3 d0 40 62 [	 ]*mdtr	%f6,%f2,%f4
+.*:	b3 d8 40 62 [	 ]*mxtr	%f6,%f2,%f4
+.*:	b3 f5 21 64 [	 ]*qadtr	%f6,%f2,%f4,1
+.*:	b3 fd 21 64 [	 ]*qaxtr	%f6,%f2,%f4,1
+.*:	b3 f7 21 64 [	 ]*rrdtr	%f6,%f2,%f4,1
+.*:	b3 ff 21 64 [	 ]*rrxtr	%f6,%f2,%f4,1
+.*:	b2 b9 10 03 [	 ]*srnmt	3\(%r1\)
+.*:	b3 85 00 20 [	 ]*sfasr	%r2
+.*:	ed 21 40 03 60 40 [	 ]*sldt	%f6,%f2,3\(%r1,%r4\)
+.*:	ed 21 40 03 60 48 [	 ]*slxt	%f6,%f2,3\(%r1,%r4\)
+.*:	ed 21 40 03 60 41 [	 ]*srdt	%f6,%f2,3\(%r1,%r4\)
+.*:	ed 21 40 03 60 49 [	 ]*srxt	%f6,%f2,3\(%r1,%r4\)
+.*:	b3 d3 40 62 [	 ]*sdtr	%f6,%f2,%f4
+.*:	b3 db 40 62 [	 ]*sxtr	%f6,%f2,%f4
+.*:	ed 61 20 03 00 50 [	 ]*tcet	%f6,3\(%r1,%r2\)
+.*:	ed 61 20 03 00 54 [	 ]*tcdt	%f6,3\(%r1,%r2\)
+.*:	ed 61 20 03 00 58 [	 ]*tcxt	%f6,3\(%r1,%r2\)
+.*:	ed 61 20 03 00 51 [	 ]*tget	%f6,3\(%r1,%r2\)
+.*:	ed 61 20 03 00 55 [	 ]*tgdt	%f6,3\(%r1,%r2\)
+.*:	ed 61 20 03 00 59 [	 ]*tgxt	%f6,3\(%r1,%r2\)
diff --git a/gas/testsuite/gas/s390/zarch-z9-ec.s b/gas/testsuite/gas/s390/zarch-z9-ec.s
new file mode 100644
index 0000000..1543511
--- /dev/null
+++ b/gas/testsuite/gas/s390/zarch-z9-ec.s
@@ -0,0 +1,65 @@
+.text
+foo:
+	lpdfr	%f6,%f2
+	lndfr	%f6,%f2
+	cpsdr	%f6,%f1,%f2
+	lcdfr	%f6,%f2
+	ldgr	%f6,%r2
+	lgdr	%r2,%f6
+	adtr	%f6,%f2,%f4
+	axtr	%f6,%f2,%f4
+	cdtr	%f6,%f2
+	cxtr	%f6,%f2
+	kdtr	%f6,%f2
+	kxtr	%f6,%f2
+	cedtr	%f6,%f2
+	cextr	%f6,%f2
+	cdgtr	%f6,%r2
+	cxgtr	%f6,%r2
+	cdstr	%f6,%r2
+	cxstr	%f6,%r2
+	cdutr	%f6,%r2
+	cxutr	%f6,%r2
+	cgdtr	%r2,1,%f6
+	cgxtr	%r2,1,%f6
+	csdtr	%r2,%f6
+	csxtr	%r2,%f6
+	cudtr	%r2,%f6
+	cuxtr	%r2,%f6
+	ddtr	%f6,%f2,%f4
+	dxtr	%f6,%f2,%f4
+	eedtr	%r2,%f6
+	eextr	%r2,%f6
+	esdtr	%r2,%f6
+	esxtr	%r2,%f6
+	iedtr	%f6,%f2,%r4
+	iextr	%f6,%f2,%r4
+	ltdtr	%f6,%f2
+	ltxtr	%f6,%f2
+	fidtr	%f6,1,%f2,3
+	fixtr	%f6,1,%f2,3
+	lfas	3(%r1)
+	ldetr	%f6,%f2,1
+	lxdtr	%f6,%f2,1
+	ledtr	%f6,1,%f2,3
+	ldxtr	%f6,1,%f2,3
+	mdtr	%f6,%f2,%f4
+	mxtr	%f6,%f2,%f4
+	qadtr	%f6,%f2,%f4,1
+	qaxtr	%f6,%f2,%f4,1
+	rrdtr	%f6,%f2,%f4,1
+	rrxtr	%f6,%f2,%f4,1
+	srnmt	3(%r1)
+	sfasr	%r2
+	sldt	%f6,%f2,3(%r1,%r4)
+	slxt	%f6,%f2,3(%r1,%r4)
+	srdt	%f6,%f2,3(%r1,%r4)
+	srxt	%f6,%f2,3(%r1,%r4)
+	sdtr	%f6,%f2,%f4
+	sxtr	%f6,%f2,%f4
+	tcet	%f6,3(%r1,%r2)
+	tcdt	%f6,3(%r1,%r2)
+	tcxt	%f6,3(%r1,%r2)
+	tget	%f6,3(%r1,%r2)
+	tgdt	%f6,3(%r1,%r2)
+	tgxt	%f6,3(%r1,%r2)