Regenerate configure

[binutils-gdb.git] / opcodes / msp430-dis.c

diff --git a/opcodes/msp430-dis.c b/opcodes/msp430-dis.c
index d7e8d8a8da2cdfa9d318b39e89b89e3a382ea242..676a2d855efbc720b440e94359e00d3a9cbfaee6 100644 (file)
--- a/opcodes/msp430-dis.c
+++ b/opcodes/msp430-dis.c
@@ -1102,7 +1102,7 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info)
                }
              else if (extension_word)
                {
-                 if (extension_word & (1 << 6))
+                 if (extension_word & BYTE_OPERATION)
                    bc = ".w";
                  else
                    {
@@ -1181,7 +1181,12 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info)
        prin (stream, "rpt #%d { ", (extension_word & 0xf) + 1);
     }
 
-  if (extension_word && opcode->name[strlen (opcode->name) - 1] != 'x')
+  /* Special case:  RRC with an extension word and the ZC bit set is actually RRU.  */
+  if (extension_word
+      && (extension_word & IGNORE_CARRY_BIT)
+      && strcmp (opcode->name, "rrc") == 0)
+    (*prin) (stream, "rrux%s", bc);
+  else if (extension_word && opcode->name[strlen (opcode->name) - 1] != 'x')
     (*prin) (stream, "%sx%s", opcode->name, bc);
   else
     (*prin) (stream, "%s%s", opcode->name, bc);