Change msp430 emulation to msp430elf

[deliverable/binutils-gdb.git] / opcodes / rl78-dis.c

diff --git a/opcodes/rl78-dis.c b/opcodes/rl78-dis.c
index 1ceee8d2e033e2c58a9bb113e40faf7c7c7718da..a2298ce4d7e517b63680b211608c45bd86f2a061 100644 (file)
--- a/opcodes/rl78-dis.c
+++ b/opcodes/rl78-dis.c
@@ -1,5 +1,5 @@
 /* Disassembler code for Renesas RL78.
-   Copyright 2011, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 Free Software Foundation, Inc.
    Contributed by Red Hat.
    Written by DJ Delorie.
 
@@ -217,7 +217,7 @@ print_insn_rl78 (bfd_vma addr, disassemble_info * dis)
 
            case '0':
            case '1':
-             oper = opcode.op + *s - '0';
+             oper = *s == '0' ? &opcode.op[0] : &opcode.op[1];
            if (do_es)
              {
                if (oper->use_es && indirect_type (oper->type))
@@ -284,7 +284,7 @@ print_insn_rl78 (bfd_vma addr, disassemble_info * dis)
                    PR (PS, "[%s", register_names[oper->reg]);
                    if (oper->reg2 != RL78_Reg_None)
                      PR (PS, "+%s", register_names[oper->reg2]);
-                   if (oper->addend)
+                   if (oper->addend || do_addr)
                      PR (PS, "+%d", oper->addend);
                    PC (']');
                    break;