aboutsummaryrefslogtreecommitdiff
path: root/opcodes
diff options
context:
space:
mode:
Diffstat (limited to 'opcodes')
-rw-r--r--opcodes/ChangeLog6
-rw-r--r--opcodes/s390-opc.c2
-rw-r--r--opcodes/s390-opc.txt8
3 files changed, 11 insertions, 5 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 5336e46..8581095 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-11 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
+
+ * s390-opc.c: Make the instruction masks for the load/store on
+ condition instructions to cover the condition code mask as well.
+ * s390-opc.txt: lgoc -> locg and stgoc -> stocg.
+
2010-10-11 Jan Kratochvil <jan.kratochvil@redhat.com>
Jiang Jilin <freephp@gmail.com>
diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c
index fea838e..2f1487d 100644
--- a/opcodes/s390-opc.c
+++ b/opcodes/s390-opc.c
@@ -426,7 +426,7 @@ const struct s390_operand s390_operands[] =
#define MASK_RSY_AARD { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
#define MASK_RSY_CCRD { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
#define MASK_RSY_RDRM { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
-#define MASK_RSY_RDR0 { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
+#define MASK_RSY_RDR0 { 0xff, 0x0f, 0x00, 0x00, 0x00, 0xff }
#define MASK_RXE_FRRD { 0xff, 0x00, 0x00, 0x00, 0xff, 0xff }
#define MASK_RXE_RRRD { 0xff, 0x00, 0x00, 0x00, 0xff, 0xff }
#define MASK_RXF_FRRDF { 0xff, 0x00, 0x00, 0x00, 0x0f, 0xff }
diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
index 9393ba4..e9b6ffc 100644
--- a/opcodes/s390-opc.txt
+++ b/opcodes/s390-opc.txt
@@ -1008,12 +1008,12 @@ b9e2 locgr RRF_U0RR "load on condition 64 bit" z196 zarch
b9e200000000 locgr*16 RRF_00RR "load on condition 64 bit" z196 zarch
eb00000000f2 loc RSY_RDRM "load on condition 32 bit" z196 zarch
eb00000000f2 loc*12 RSY_RDR0 "load on condition 32 bit" z196 zarch
-eb00000000e2 lgoc RSY_RDRM "load on condition 64 bit" z196 zarch
-eb00000000e2 lgoc*12 RSY_RDR0 "load on condition 64 bit" z196 zarch
+eb00000000e2 locg RSY_RDRM "load on condition 64 bit" z196 zarch
+eb00000000e2 locg*12 RSY_RDR0 "load on condition 64 bit" z196 zarch
eb00000000f3 stoc RSY_RDRM "store on condition 32 bit" z196 zarch
eb00000000f3 stoc*12 RSY_RDR0 "store on condition 32 bit" z196 zarch
-eb00000000e3 stgoc RSY_RDRM "store on condition 64 bit" z196 zarch
-eb00000000e3 stgoc*12 RSY_RDR0 "store on condition 64 bit" z196 zarch
+eb00000000e3 stocg RSY_RDRM "store on condition 64 bit" z196 zarch
+eb00000000e3 stocg*12 RSY_RDR0 "store on condition 64 bit" z196 zarch
b9f8 ark RRF_R0RR2 "add 3 operands 32 bit" z196 zarch
b9e8 agrk RRF_R0RR2 "add 3 operands 64 bit" z196 zarch
ec00000000d8 ahik RIE_RRI0 "add immediate 3 operands 32 bit" z196 zarch