diff --git a/gas/ChangeLog b/gas/ChangeLog index 384b40fae0..7a26a1a673 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2016-09-12 Patrick Steuer + + * testsuite/gas/s390/zarch-z196.d: Adjust testcase. + 2016-09-08 H.J. Lu * 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 aaefe20ada..26ab7ae502 100644 --- 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 593fc06d32..b36b52ecb7 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2016-09-12 Patrick Steuer + + * s390-opc.txt: Fix kmctr instruction type. + 2016-09-07 H.J. Lu * i386-gen.c (cpu_flag_init): Remove CPU_IAMCU_COMPAT_FLAGS. diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt index 46db26f223..3675762d55 100644 --- 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