S/390: Fix arch level of pckmo instruction.

Fix wrong architecture level of PCKMO instruction.

Committed to mainline.

opcodes/ChangeLog:

2017-05-17  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* s390-opc.txt: PCKMO change arch level to z196.

gas/ChangeLog:

2017-05-17  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* testsuite/gas/s390/zarch-z10.d: Remove pckmo.
	* testsuite/gas/s390/zarch-z10.s: Remove pckmo.
	* testsuite/gas/s390/zarch-z196.d: Add pckmo.
	* testsuite/gas/s390/zarch-z196.s: Add pckmo.

diff --git a/gas/testsuite/gas/s390/zarch-z10.d b/gas/testsuite/gas/s390/zarch-z10.d
index 412f2b582c8740d0fdbccb4afe167c4d85e4aa7b..e60ec5155474ca15a46d98229d2efa6ab0d90e55 100644 (file)
--- a/gas/testsuite/gas/s390/zarch-z10.d
+++ b/gas/testsuite/gas/s390/zarch-z10.d
@@ -385,5 +385,4 @@ Disassembly of section .text:
 .*:    b2 e0 00 67 [    ]*scctr        %r6,%r7
 .*:    b2 e1 00 67 [    ]*spctr        %r6,%r7
 .*:    b2 80 6d 05 [    ]*lpp  3333\(%r6\)
-.*:    b9 28 00 00 [    ]*pckmo
 .*:    07 07 [  ]*nopr %r7

diff --git a/gas/testsuite/gas/s390/zarch-z10.s b/gas/testsuite/gas/s390/zarch-z10.s
index 0c18cd2a9d111b664fee254144f8e30cffde4230..bd292e998ad9b2deab9e4844025c6c0ab738fae6 100644 (file)
--- a/gas/testsuite/gas/s390/zarch-z10.s
+++ b/gas/testsuite/gas/s390/zarch-z10.s
@@ -379,4 +379,3 @@ foo:
        scctr   %r6,%r7
        spctr   %r6,%r7
        lpp     3333(%r6)
-       pckmo

diff --git a/gas/testsuite/gas/s390/zarch-z196.d b/gas/testsuite/gas/s390/zarch-z196.d
index 26ab7ae50277bdf2654a250900f233db9e976ac4..3889d32e02f4c582999cdbec79b472c8c0164da2 100644 (file)
--- a/gas/testsuite/gas/s390/zarch-z196.d
+++ b/gas/testsuite/gas/s390/zarch-z196.d
@@ -258,4 +258,5 @@ Disassembly of section .text:
 .*:    b9 2b 00 56 [    ]*kmo  %r5,%r6
 .*:    b9 2c 00 00 [    ]*pcc
 .*:    b9 2d 60 59 [    ]*kmctr        %r5,%r6,%r9
+.*:    b9 28 00 00 [    ]*pckmo
 .*:    07 07 [  ]*nopr %r7

diff --git a/gas/testsuite/gas/s390/zarch-z196.s b/gas/testsuite/gas/s390/zarch-z196.s
index 887cb81f8f1bd6bb53f127a42781140e594fe85e..31be5a62dba9bb45bb56c5d3d074ae26e2ab237f 100644 (file)
--- a/gas/testsuite/gas/s390/zarch-z196.s
+++ b/gas/testsuite/gas/s390/zarch-z196.s
@@ -260,3 +260,4 @@ foo:
        kmo %r5,%r6
        pcc
        kmctr %r5,%r6,%r9
+       pckmo

diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
index 51a17f3b3712f2324e802556957cd5072f8ffe78..36ad2e7d7a52c2f92ee828af495763cf53796047 100644 (file)
--- a/opcodes/s390-opc.txt
+++ b/opcodes/s390-opc.txt
@@ -976,7 +976,6 @@ b286 qsi S_RD "query sampling information" z10 zarch
 b2e0 scctr RRE_RR "set cpu counter" z10 zarch
 b2e1 spctr RRE_RR "set peripheral counter" z10 zarch
 b280 lpp S_RD "load program parameter" z10 zarch
-b928 pckmo RRE_00 "perform cryptographic key management operation" z10 zarch
 
 # The new instructions of the IBM zEnterprise z196
 b9c8 ahhhr RRF_R0RR2 "add high high" z196 zarch
@@ -1116,6 +1115,7 @@ b92a kmf RRE_RR "cipher message with CFB" z196 zarch
 b92b kmo RRE_RR "cipher message with OFB" z196 zarch
 b92c pcc RRE_00 "perform cryptographic computation" z196 zarch
 b92d kmctr RRF_R0RR "cipher message with counter" z196 zarch
+b928 pckmo RRE_00 "perform cryptographic key management operation" z196 zarch
 
 # The new instructions of the IBM zEnterprise EC12
 b2ec etnd RRE_R0 "extract transaction nesting depth" zEC12 zarch htm