* h8300-dis.c (bfd_h8_disassemble): Add missing consts.

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

diff --git a/opcodes/mcore-dis.c b/opcodes/mcore-dis.c
index ad45318..24bbff4 100644 (file)
--- a/opcodes/mcore-dis.c
+++ b/opcodes/mcore-dis.c
@@ -1,5 +1,5 @@
 /* Disassemble Motorola M*Core instructions.
-   Copyright 1993, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1993, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@ 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
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include "sysdep.h"
 #include <stdio.h>
@@ -89,12 +89,12 @@ print_insn_mcore (memaddr, info)
      bfd_vma memaddr;
      struct disassemble_info *info;
 {
-  unsigned char       ibytes[4];
-  fprintf_ftype       fprintf = info->fprintf_func;
-  void *              stream = info->stream;
-  unsigned short      inst;
-  mcore_opcode_info * op;
-  int                 status;
+  unsigned char ibytes[4];
+  fprintf_ftype fprintf = info->fprintf_func;
+  void *stream = info->stream;
+  unsigned short inst;
+  const mcore_opcode_info *op;
+  int status;
 
   info->bytes_per_chunk = 2;
 
@@ -128,19 +128,48 @@ print_insn_mcore (memaddr, info)
 
       switch (op->opclass)
        {
-       case O0: break;
-       case OT: fprintf (stream, "\t%d", inst & 0x3); break;
+       case O0:
+         break;
+
+       case OT:
+         fprintf (stream, "\t%d", inst & 0x3);
+         break;
+
        case O1:
        case JMP:
-       case JSR: fprintf (stream, "\t%s", name); break;
-       case OC:  fprintf (stream, "\t%s, %s", name, crname[(inst >> 4) & 0x1F]); break;
-       case O1R1: fprintf (stream, "\t%s, r1", name); break;
+       case JSR:
+         fprintf (stream, "\t%s", name);
+         break;
+
+       case OC:
+         fprintf (stream, "\t%s, %s", name, crname[(inst >> 4) & 0x1F]);
+         break;
+
+       case O1R1:
+         fprintf (stream, "\t%s, r1", name);
+         break;
+
        case MULSH:
-       case O2: fprintf (stream, "\t%s, %s", name, grname[(inst >> 4) & 0xF]); break;
-       case X1: fprintf (stream, "\tr1, %s", name); break;
-       case OI: fprintf (stream, "\t%s, %d", name, ((inst >> 4) & 0x1F) + 1); break;
-       case RM: fprintf (stream, "\t%s-r15, (r0)", name); break;
-       case RQ: fprintf (stream, "\tr4-r7, (%s)", name); break;
+       case O2:
+         fprintf (stream, "\t%s, %s", name, grname[(inst >> 4) & 0xF]);
+         break;
+
+       case X1:
+         fprintf (stream, "\tr1, %s", name);
+         break;
+
+       case OI:
+         fprintf (stream, "\t%s, %d", name, ((inst >> 4) & 0x1F) + 1);
+         break;
+
+       case RM:
+         fprintf (stream, "\t%s-r15, (r0)", name);
+         break;
+
+       case RQ:
+         fprintf (stream, "\tr4-r7, (%s)", name);
+         break;
+
        case OB:
        case OBRa:
        case OBRb:
@@ -149,10 +178,17 @@ print_insn_mcore (memaddr, info)
        case SIa:
        case OMa:
        case OMb:
-       case OMc: fprintf (stream, "\t%s, %d", name, (inst >> 4) & 0x1F); break;
-       case I7: fprintf (stream, "\t%s, %d", name, (inst >> 4) & 0x7F); break;
-       case LS: fprintf (stream, "\t%s, (%s, %d)", grname[(inst >> 8) & 0xF],
-                         name, ((inst >> 4) & 0xF) << isiz[(inst >> 13) & 3]);
+       case OMc:
+         fprintf (stream, "\t%s, %d", name, (inst >> 4) & 0x1F);
+         break;
+
+       case I7:
+         fprintf (stream, "\t%s, %d", name, (inst >> 4) & 0x7F);
+         break;
+
+       case LS:
+         fprintf (stream, "\t%s, (%s, %d)", grname[(inst >> 8) & 0xF],
+                  name, ((inst >> 4) & 0xF) << isiz[(inst >> 13) & 3]);
          break;
 
        case BR:
@@ -162,7 +198,7 @@ print_insn_mcore (memaddr, info)
            if (inst & 0x400)
              val |= 0xFFFFFC00;
 
-           fprintf (stream, "\t0x%x", memaddr + 2 + (val << 1));
+           fprintf (stream, "\t0x%lx", (long)(memaddr + 2 + (val << 1)));
 
            if (strcmp (op->name, "bsr") == 0)
              {
@@ -182,8 +218,8 @@ print_insn_mcore (memaddr, info)
          {
            long val;
            val = (inst & 0x000F);
-           fprintf (stream, "\t%s, 0x%x",
-                    grname[(inst >> 4) & 0xF], memaddr - (val << 1));
+           fprintf (stream, "\t%s, 0x%lx",
+                    grname[(inst >> 4) & 0xF], (long)(memaddr - (val << 1)));
          }
          break;
 
@@ -208,11 +244,11 @@ print_insn_mcore (memaddr, info)
                | (ibytes[2] << 8) | (ibytes[3]);
 
            /* Removed [] around literal value to match ABI syntax 12/95.  */
-           fprintf (stream, "\t%s, 0x%X", grname[(inst >> 8) & 0xF], val);
+           fprintf (stream, "\t%s, 0x%lX", grname[(inst >> 8) & 0xF], val);
 
            if (val == 0)
-             fprintf (stream, "\t// from address pool at 0x%x",
-                      (memaddr + 2 + ((inst & 0xFF) << 2)) & 0xFFFFFFFC);
+             fprintf (stream, "\t// from address pool at 0x%lx",
+                      (long)(memaddr + 2 + ((inst & 0xFF) << 2)) & 0xFFFFFFFC);
          }
          break;
 
@@ -237,7 +273,7 @@ print_insn_mcore (memaddr, info)
                | (ibytes[2] << 8) | (ibytes[3]);
 
            /* Removed [] around literal value to match ABI syntax 12/95.  */
-           fprintf (stream, "\t0x%X", val);
+           fprintf (stream, "\t0x%lX", val);
            /* For jmpi/jsri, we'll try to get a symbol for the target.  */
            if (info->print_address_func && val != 0)
              {
@@ -246,8 +282,8 @@ print_insn_mcore (memaddr, info)
              }
            else
              {
-               fprintf (stream, "\t// from address pool at 0x%x",
-                        (memaddr + 2 + ((inst & 0xFF) << 2)) & 0xFFFFFFFC);
+               fprintf (stream, "\t// from address pool at 0x%lx",
+                        (long)(memaddr + 2 + ((inst & 0xFF) << 2)) & 0xFFFFFFFC);
              }
          }
          break;