From: Nick Clifton <nickc@redhat.com>
Date: Thu, 4 Jun 2015 15:33:12 +0000 (+0100)
Subject: Fixes the check for emulated MSP430 instrucrtions that take no operands.
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=13be46a23c97f8bdb4ac028c1498197e44fe2e62;p=deliverable%2Fbinutils-gdb.git

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 417e05d5b0..72a4b62bb9 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 9c6f6590bc..15f3eca9c1 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...");