2012-03-08 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>

	* s390-opc.txt: Set instruction type of pku to SS_L2RDRD.

2012-03-08  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* gas/s390/esa-g5.d: Move length field to the second operand.
	* gas/s390/esa-g5.s: Likewise.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index cfa3ef36a94f168cd393a0ccaea378baf8547502..19dd01eed066c16c373796369310c5fe29a1dd16 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-08  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       * gas/s390/esa-g5.d: Move length field to the second operand.
+       * gas/s390/esa-g5.s: Likewise.
+
 2012-02-14  Alan Modra  <amodra@gmail.com>
 
        * gas/elf/bad-group.s: Add section attributes.

diff --git a/gas/testsuite/gas/s390/esa-g5.d b/gas/testsuite/gas/s390/esa-g5.d
index ca77038a2a3d63a37e88ac1f8aa2648e924dc9df..2896966354dabe13befc85fc7ce155b1bf34b8c5 100644 (file)
--- a/gas/testsuite/gas/s390/esa-g5.d
+++ b/gas/testsuite/gas/s390/esa-g5.d
@@ -345,7 +345,7 @@ Disassembly of section .text:
 .*:    b2 2e 00 69 [    ]*pgin %r6,%r9
 .*:    b2 2f 00 69 [    ]*pgout        %r6,%r9
 .*:    e9 1f 5f ff af ff [      ]*pka  4095\(%r5\),4095\(32,%r10\)
-.*:    e1 ff 5f ff af ff [      ]*pku  4095\(256,%r5\),4095\(%r10\)
+.*:    e1 ff 5f ff af ff [      ]*pku  4095\(%r5\),4095\(256,%r10\)
 .*:    ee 69 5f ff af ff [      ]*plo  %r6,4095\(%r5\),%r9,4095\(%r10\)
 .*:    01 01 [  ]*pr
 .*:    b2 28 00 69 [    ]*pt   %r6,%r9

diff --git a/gas/testsuite/gas/s390/esa-g5.s b/gas/testsuite/gas/s390/esa-g5.s
index e34e4b32b105fc92cf6a2f9461896a3cc92136a9..d0bfb20d94f9388228e09ac9a33cb124cb871ba5 100644 (file)
--- a/gas/testsuite/gas/s390/esa-g5.s
+++ b/gas/testsuite/gas/s390/esa-g5.s
@@ -339,7 +339,7 @@ foo:
        pgin    %r6,%r9
        pgout   %r6,%r9
        pka     4095(%r5),4095(32,%r10)
-       pku     4095(256,%r5),4095(%r10)
+       pku     4095(%r5),4095(256,%r10)
        plo     %r6,4095(%r5),%r9,4095(%r10)
        pr
        pt      %r6,%r9

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 1a6837f648db59d6c18c7225fdc245618e49a72c..f6a0abff4298242681bed4baa33618b03aa60695 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-08  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       * s390-opc.txt: Set instruction type of pku to SS_L2RDRD.
+
 2012-02-27  Alan Modra  <amodra@gmail.com>
 
        * mt-dis.c: Regenerate.

diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
index 1943fd69fa53002aacd60b6f3791f5d04d1f167c..58b54d13135ba14143af416b5d181dcdfa8388f9 100644 (file)
--- a/opcodes/s390-opc.txt
+++ b/opcodes/s390-opc.txt
@@ -372,7 +372,7 @@ b278 stcke S_RD "store clock extended" g5 esa,zarch
 b2a5 tre RRE_RER "translate extended" g5 esa,zarch
 eb000000008e mvclu RSE_RERERD "move long unicode" g5 esa,zarch
 e9 pka SS_L2RDRD "pack ascii" g5 esa,zarch
-e1 pku SS_L0RDRD "pack unicode" g5 esa,zarch
+e1 pku SS_L2RDRD "pack unicode" g5 esa,zarch
 b993 troo RRE_RER "translate one to one" g5 esa,zarch
 b992 trot RRE_RER "translate one to two" g5 esa,zarch
 b991 trto RRE_RER "translate two to one" g5 esa,zarch