Return std::string from canonical_to_fullform

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

diff --git a/opcodes/v850-dis.c b/opcodes/v850-dis.c
index d10f3e06c78483e8128149b9fdb3b840d54db2b2..af4437c1984f899089ed4c454ed3c96512f21557 100644 (file)
--- a/opcodes/v850-dis.c
+++ b/opcodes/v850-dis.c
@@ -1,5 +1,5 @@
 /* Disassemble V850 instructions.
-   Copyright (C) 1996-2015 Free Software Foundation, Inc.
+   Copyright (C) 1996-2018 Free Software Foundation, Inc.
 
    This file is part of the GNU opcodes library.
 
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "opcode/v850.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 
 static const char *const v850_reg_names[] =
@@ -152,7 +152,7 @@ get_operand_value (const struct v850_operand *operand,
          if (operand->flags & V850E_IMMEDIATE16HI)
            value <<= 16;
          else if (value & 0x8000)
-           value |= (-1L << 16);
+           value |= (-1UL << 16);
 
          return value;
        }
@@ -450,7 +450,8 @@ disassemble (bfd_vma memaddr,
                      case 0xffe00001: regs = list12_regs; break;
                      default:
                        /* xgettext:c-format */
-                       fprintf (stderr, _("unknown operand shift: %x\n"), operand->shift);
+                       opcodes_error_handler (_("unknown operand shift: %x"),
+                                              operand->shift);
                        abort ();
                      }
 
@@ -460,10 +461,17 @@ disassemble (bfd_vma memaddr,
                          {
                            switch (regs[ i ])
                              {
-                             default: mask |= (1 << regs[ i ]); break;
+                             default:
+                               mask |= (1 << regs[ i ]);
+                               break;
+                             case 0:
                                /* xgettext:c-format */
-                             case 0:  fprintf (stderr, _("unknown reg: %d\n"), i ); abort ();
-                             case -1: pc = 1; break;
+                               opcodes_error_handler (_("unknown reg: %d"), i);
+                               abort ();
+                               break;
+                             case -1:
+                               pc = 1;
+                               break;
                              }
                          }
                      }