Fixes the check for emulated MSP430 instrucrtions that take no operands.

	PR 18474
	* msp430-dis.c (msp430_nooperands): Fix check for emulated insns.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 417e05d5b0e1af19d3671e8ccc525be455a169c4..72a4b62bb90b6a76ad8ce932bb0ea52ad82f4c9e 100644 (file)
--- 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 9c6f6590bc4f9f1271747228aea9b5955741fd08..15f3eca9c186f948bf0b8b2ebc872816cd8072f5 100644 (file)
--- 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...");