X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=opcodes%2Fh8300-dis.c;h=d6491b8a52b9dc14a960c2fd0fd5246d3bea0dcf;hb=04ff16f319c08369e3fbfeec60c41e28e930abab;hp=9c77e912ee7961cad49c3e8320e3ed3e5ee029cc;hpb=335c0d719b8bbcf9add1aa6a60dacd4480afdfab;p=pf3gnuchains%2Fpf3gnuchains3x.git

diff --git a/opcodes/h8300-dis.c b/opcodes/h8300-dis.c
index 9c77e912ee..d6491b8a52 100644
--- a/opcodes/h8300-dis.c
+++ b/opcodes/h8300-dis.c
@@ -1,16 +1,18 @@
 /* Disassemble h8300 instructions.
-   Copyright 1993, 1994, 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright 1993, 1994, 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   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
@@ -279,17 +281,17 @@ print_one_arg (disassemble_info *info,
       if ((x & SIZE) == L_16 ||
 	  (x & SIZE) == L_16U)
 	{
-	  outfn (stream, ".%s%d (0x%x)",
+	  outfn (stream, ".%s%d (0x%lx)",
 		   (short) cst > 0 ? "+" : "",
 		   (short) cst, 
-		   addr + (short) cst + len);
+		   (long)(addr + (short) cst + len));
 	}
       else
 	{
-	  outfn (stream, ".%s%d (0x%x)",
+	  outfn (stream, ".%s%d (0x%lx)",
 		   (char) cst > 0 ? "+" : "",
 		   (char) cst, 
-		   addr + (char) cst + len);
+		   (long)(addr + (char) cst + len));
 	}
     }
   else if ((x & MODE) == DISP)
@@ -362,7 +364,7 @@ bfd_h8_disassemble (bfd_vma addr, disassemble_info *info, int mach)
   for (qi = h8_instructions; qi->opcode->name; qi++)
     {
       const struct h8_opcode *q = qi->opcode;
-      op_type *nib = q->data.nib;
+      const op_type *nib = q->data.nib;
       unsigned int len = 0;
 
       while (1)
@@ -638,9 +640,9 @@ bfd_h8_disassemble (bfd_vma addr, disassemble_info *info, int mach)
 			       regno[1]);
 		      return qi->length;
 		    }
-		  if (strncmp (q->name, "mova", 4) == 0)
+		  if (CONST_STRNEQ (q->name, "mova"))
 		    {
-		      op_type *args = q->args.nib;
+		      const op_type *args = q->args.nib;
 
 		      if (args[1] == (op_type) E)
 			{
@@ -666,7 +668,7 @@ bfd_h8_disassemble (bfd_vma addr, disassemble_info *info, int mach)
 		    }
 		  /* Fill in the args.  */
 		  {
-		    op_type *args = q->args.nib;
+		    const op_type *args = q->args.nib;
 		    int hadone = 0;
 		    int nargs;