aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--opcodes/ChangeLog5
-rw-r--r--opcodes/msp430-dis.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 417e05d..72a4b62 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-04 Nick Clifton <nickc@redhat.com>
+
+ PR 18474
+ * msp430-dis.c (msp430_nooperands): Fix check for emulated insns.
+
2015-06-02 Matthew Wahab <matthew.wahab@arm.com>
* arm-dis.c (arm_opcodes): Add "setpan".
diff --git a/opcodes/msp430-dis.c b/opcodes/msp430-dis.c
index 9c6f659..15f3eca 100644
--- a/opcodes/msp430-dis.c
+++ b/opcodes/msp430-dis.c
@@ -66,7 +66,7 @@ msp430_nooperands (struct msp430_opcode_s *opcode,
if (opcode->fmt == 0)
{
- if ((insn & 0x0f00) != 3 || (insn & 0x0f00) != 2)
+ if ((insn & 0x0f00) != 0x0300 || (insn & 0x0f00) != 0x0200)
return 0;
strcpy (comm, "emulated...");