S/390: Fix kmctr instruction type.

opcodes/ChangeLog:

2016-09-12  Patrick Steuer  <steuer@linux.vnet.ibm.com>

	* s390-opc.txt: Fix kmctr instruction type.

gas/ChangeLog:

2016-09-12  Patrick Steuer  <steuer@linux.vnet.ibm.com>

	* testsuite/gas/s390/zarch-z196.d: Adjust testcase.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 384b40fae0e8c7b4520f744c495795f15fc62b5d..7a26a1a6734183dbdc2c438c10b1be2b366fa18c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2016-09-12  Patrick Steuer  <steuer@linux.vnet.ibm.com>
+
+       * testsuite/gas/s390/zarch-z196.d: Adjust testcase.
+
 2016-09-08  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/tc-i386.c (i386_target_format): Allow PROCESSOR_IAMCU

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

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 593fc06d32e976ae6ca1291285736d0ac311db80..b36b52ecb7f2634f8d0025788db414ccd6df3605 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2016-09-12  Patrick Steuer  <steuer@linux.vnet.ibm.com>
+
+       * s390-opc.txt: Fix kmctr instruction type.
+
 2016-09-07  H.J. Lu  <hongjiu.lu@intel.com>
 
        * i386-gen.c (cpu_flag_init): Remove CPU_IAMCU_COMPAT_FLAGS.

diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
index 46db26f223618cdb73b2a7f0f2ca9772f818ad28..3675762d55ab8c40f1dfb45119cfd4622442846e 100644 (file)
--- a/opcodes/s390-opc.txt
+++ b/opcodes/s390-opc.txt
@@ -1115,7 +1115,7 @@ b2b8 srnmb S_RD "set 3 bit bfp rounding mode" z196 zarch
 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_R0RR2 "cipher message with counter" z196 zarch
+b92d kmctr RRF_R0RR "cipher message with counter" z196 zarch
 
 # The new instructions of the IBM zEnterprise EC12
 b2ec etnd RRE_R0 "extract transaction nesting depth" zEC12 zarch htm