2007-04-24 Andreas Krebbel <krebbel1@de.ibm.com>

* opcodes/s390-opc.c (MASK_SSF_RRDRD): Fourth nybble belongs to the
	opcode.
	* opcodes/s390-opc.txt (pfpo, ectg, csst): New z9-ec instructions added.


2007-04-24  Andreas Krebbel  <krebbel1@de.ibm.com>

	* gas/s390/zarch-z9-ec.d: Add pfpo, ectg and csst.
	* gas/s390/zarch-z9-ec.s: Likewise.

gas/testsuite/ChangeLog

@@ -1,3 +1,8 @@
+2007-04-24  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+	* gas/s390/zarch-z9-ec.d: Add pfpo, ectg and csst.
+	* gas/s390/zarch-z9-ec.s: Likewise.
+
 2007-04-23  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* gas/m68k/br-isaa.s: New.

gas/testsuite/gas/s390/zarch-z9-ec.d

@@ -69,3 +69,8 @@ Disassembly of section .text:
 .*:	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\)
+.*:	01 0a [	 ]*pfpo
+.*:	c8 31 10 0a 20 14 [	 ]*ectg	10\(%r1\),20\(%r2\),%r3
+.*:	c8 32 10 0a 20 14 [	 ]*csst	10\(%r1\),20\(%r2\),%r3
+# Expect 2 bytes of padding.
+.*:	07 07 [	 ]*bcr	0,%r7

gas/testsuite/gas/s390/zarch-z9-ec.s

@@ -63,3 +63,10 @@ foo:
 	tget	%f6,3(%r1,%r2)
 	tgdt	%f6,3(%r1,%r2)
 	tgxt	%f6,3(%r1,%r2)
+	pfpo
+	ectg	10(%r1),20(%r2),%r3
+	csst	10(%r1),20(%r2),%r3
+	/* The following .data section is 4 byte aligned.
+	   So we get 2 additional bytes of 07 07 wherefor
+	   we have to provide an instruction.  */
+	bcr	0,%r7

opcodes/ChangeLog

@@ -1,3 +1,8 @@
+2007-04-24  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+	* opcodes/s390-opc.c (MASK_SSF_RRDRD): Fourth nybble belongs to the
+	opcode.
+	* opcodes/s390-opc.txt (pfpo, ectg, csst): New z9-ec instructions added.
 2007-04-24  Nick Clifton  <nickc@redhat.com>
 
 	* arm-dis.c (print_insn): Initialise type.

opcodes/s390-opc.c

@@ -345,7 +345,7 @@ const struct s390_operand s390_operands[] =
 #define MASK_SS_RRRDRD3  { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }
 #define MASK_S_00        { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 }
 #define MASK_S_RD        { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }
-#define MASK_SSF_RRDRD   { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }
+#define MASK_SSF_RRDRD   { 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00 }
 
 /* The opcode formats table (blueprints for .insn pseudo mnemonic).  */
 

opcodes/s390-opc.txt

@@ -926,3 +926,6 @@ ed0000000058 tcxt RXE_FRRD "test data class extended dfp" z9-ec zarch
 ed0000000051 tget RXE_FRRD "test data group short dfp" z9-ec zarch
 ed0000000055 tgdt RXE_FRRD "test data group long dfp" z9-ec zarch
 ed0000000059 tgxt 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