daily update

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

diff --git a/opcodes/h8300-dis.c b/opcodes/h8300-dis.c
index 9c77e912ee7961cad49c3e8320e3ed3e5ee029cc..d0e300656d7c682be5b3e3d308a5ff84b1073440 100644 (file)
--- a/opcodes/h8300-dis.c
+++ b/opcodes/h8300-dis.c
@@ -1,5 +1,5 @@
 /* Disassemble h8300 instructions.
-   Copyright 1993, 1994, 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+   Copyright 1993, 1994, 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -279,17 +279,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 +362,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 +638,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 +666,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;