aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/testsuite/gas/s390/zarch-z10.d1
-rw-r--r--gas/testsuite/gas/s390/zarch-z10.s1
-rw-r--r--gas/testsuite/gas/s390/zarch-z196.d1
-rw-r--r--gas/testsuite/gas/s390/zarch-z196.s1
-rw-r--r--opcodes/s390-opc.txt2
5 files changed, 3 insertions, 3 deletions
diff --git a/gas/testsuite/gas/s390/zarch-z10.d b/gas/testsuite/gas/s390/zarch-z10.d
index 412f2b5..e60ec51 100644
--- 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 0c18cd2..bd292e9 100644
--- 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 26ab7ae..3889d32 100644
--- 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 887cb81..31be5a6 100644
--- 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 51a17f3..36ad2e7 100644
--- 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