Catch a bug in the msp430 disassembler where an add instruction was confused

with an rla instruction.  Add a test for this to the testsuite.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index eacd265..90c75dc 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-02  Albert Bartoszko  <albar@nt.kegel.com.pl>
+
+       * msp430-dis.c (msp430_doubleoperand): Check for an 'add'
+       instruction which looks similar to an 'rla' instruction.
 
 For older changes see ChangeLog-0203
 \f

diff --git a/opcodes/msp430-dis.c b/opcodes/msp430-dis.c
index 767ffa4..1b5ffb1 100644 (file)
--- a/opcodes/msp430-dis.c
+++ b/opcodes/msp430-dis.c
@@ -1,5 +1,5 @@
 /* Disassemble MSP430 instructions.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
    
    Contributed by Dmitry Diky <diwil@mail.ru>
         
@@ -491,6 +491,10 @@ msp430_doubleoperand (info, opcode, addr, insn, op1, op2, comm1, comm2, cycles)
            {
              /* Absolute.  */
              dst = msp430dis_opcode (addr + 2, info);
+             /* If the 'src' field is not the same as the dst
+                then this is not an rla instruction.  */
+             if (dst != msp430dis_opcode (addr + 4, info))
+               return 0;
              cmd_len += 4;
              *cycles = 6;
              sprintf (op1, "&0x%04x", PS (dst));