This commit was manufactured by cvs2svn to create branch 'gdb_7_0-branch'.

[external/binutils.git] / opcodes / v850-dis.c

diff --git a/opcodes/v850-dis.c b/opcodes/v850-dis.c
index 1bfc7b4..6cf9029 100644 (file)
--- a/opcodes/v850-dis.c
+++ b/opcodes/v850-dis.c
@@ -1,16 +1,18 @@
 /* Disassemble V850 instructions.
-   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005
+   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2007
    Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This file is part of the GNU opcodes library.
+
+   This library is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   It is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -187,7 +189,7 @@ disassemble (bfd_vma memaddr,
                  info->fprintf_func (info->stream, "ep");
                  break;
                default:
-                 info->fprintf_func (info->stream, "%d", value);
+                 info->fprintf_func (info->stream, "%ld", value);
                  break;
                case V850_OPERAND_DISP:
                  {
@@ -314,7 +316,7 @@ disassemble (bfd_vma memaddr,
                      if ((insn & 0x001fffc0) == 0x00130780)
                        value <<= 16;
 
-                     info->fprintf_func (info->stream, "0x%x", value);
+                     info->fprintf_func (info->stream, "0x%lx", value);
                    }
                  else
                    info->memory_error_func (status, memaddr + bytes_read,
@@ -355,9 +357,9 @@ disassemble (bfd_vma memaddr,
   if (!match)
     {
       if (short_op)
-       info->fprintf_func (info->stream, ".short\t0x%04x", insn);
+       info->fprintf_func (info->stream, ".short\t0x%04lx", insn);
       else
-       info->fprintf_func (info->stream, ".long\t0x%08x", insn);
+       info->fprintf_func (info->stream, ".long\t0x%08lx", insn);
     }
 
   return bytes_read;