Forgot to commit ChangeLog entry for CRIS gas tests. Oops.

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

diff --git a/opcodes/avr-dis.c b/opcodes/avr-dis.c
index 1ffd218f48b44ceb391cfc290604a25d7945b08f..ee91d7f223c6b609609370b76f353886cba7f631 100644 (file)
--- a/opcodes/avr-dis.c
+++ b/opcodes/avr-dis.c
@@ -103,7 +103,7 @@ avr_operand (insn, insn2, pc, constraint, buf, comment, regs)
        case 0: *buf++ = 'Z'; break;
        case 2: *buf++ = 'Y'; break;
        case 3: *buf++ = 'X'; break;
-       default: buf += sprintf (buf, _ (" unknown register ")); break;
+       default: buf += sprintf (buf, _(" unknown register ")); break;
        }
       if (insn & 0x1)
        *buf++ = '+';
@@ -135,7 +135,8 @@ avr_operand (insn, insn2, pc, constraint, buf, comment, regs)
       break;
       
     case 'h':
-      sprintf (buf, "0x%x%x", (insn & 1) | ((insn & (0x1f << 4)) >> 3), insn2);
+      sprintf (buf, "0x%x",
+              ((((insn & 1) | ((insn & 0x1f0) >> 3)) << 16) | insn2) * 2);
       break;
       
     case 'L':
@@ -164,7 +165,7 @@ avr_operand (insn, insn2, pc, constraint, buf, comment, regs)
       break;
 
     case 'n':
-      sprintf (buf, _ ("Internal disassembler error"));
+      sprintf (buf, _("Internal disassembler error"));
       break;
       
     case 'K':
@@ -204,7 +205,7 @@ avr_operand (insn, insn2, pc, constraint, buf, comment, regs)
       break;
       
     default:
-      sprintf (buf, _ ("unknown constraint `%c'"), constraint);
+      sprintf (buf, _("unknown constraint `%c'"), constraint);
     }
 }
 
@@ -279,6 +280,7 @@ print_insn_avr(addr, info)
       op2[0] = 0;
       comment1[0] = 0;
       comment2[0] = 0;
+      insn2 = 0;
 
       if (opcode->insn_size > 1)
        {