btrace: Store btrace_insn in an std::vector

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

diff --git a/opcodes/tic4x-dis.c b/opcodes/tic4x-dis.c
index c0f6152beffb2d042cfa3d7ddeefcaa6442ece06..bd314ea2e3d1a3c6a7261dce0898d86171caea5f 100644 (file)
--- a/opcodes/tic4x-dis.c
+++ b/opcodes/tic4x-dis.c
@@ -1,27 +1,30 @@
 /* Print instructions for the Texas TMS320C[34]X, for GDB and GNU Binutils.
 
-   Copyright 2002, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002-2017 Free Software Foundation, Inc.
 
    Contributed by Michael P. Hayes (m.hayes@elec.canterbury.ac.nz)
 
-   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
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
+#include "sysdep.h"
 #include <math.h>
 #include "libiberty.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/tic4x.h"
 
 #define TIC4X_DEBUG 0
@@ -117,7 +120,7 @@ tic4x_print_char (struct disassemble_info * info, char ch)
 }
 
 static int
-tic4x_print_str (struct disassemble_info *info, char *str)
+tic4x_print_str (struct disassemble_info *info, const char *str)
 {
   if (info != NULL)
     (*info->fprintf_func) (info->stream, "%s", str);
@@ -222,12 +225,12 @@ tic4x_print_immed (struct disassemble_info *info,
     {
     case IMMED_SINT:
     case IMMED_INT:
-      (*info->fprintf_func) (info->stream, "%d", (long) arg);
+      (*info->fprintf_func) (info->stream, "%ld", (long) arg);
       break;
 
     case IMMED_SUINT:
     case IMMED_UINT:
-      (*info->fprintf_func) (info->stream, "%u", arg);
+      (*info->fprintf_func) (info->stream, "%lu", arg);
       break;
 
     case IMMED_SFLOAT:
@@ -291,7 +294,7 @@ tic4x_print_indirect (struct disassemble_info *info,
   unsigned int aregno;
   unsigned int modn;
   unsigned int disp;
-  char *a;
+  const char *a;
 
   aregno = 0;
   modn = 0;
@@ -354,8 +357,8 @@ tic4x_print_op (struct disassemble_info *info,
                unsigned long pc)
 {
   int val;
-  char *s;
-  char *parallel = NULL;
+  const char *s;
+  const char *parallel = NULL;
 
   /* Print instruction name.  */
   s = p->name;
@@ -464,6 +467,7 @@ tic4x_print_op (struct disassemble_info *info,
                 return 0;
               break;
             }
+         /* Fall through.  */
 
        case 'J': /* Indirect (short) 8--15.  */
          if (! tic4x_print_indirect (info, INDIRECT_SHORT,
@@ -724,7 +728,7 @@ tic4x_disassemble (unsigned long pc,
            && tic4x_print_op (NULL, instruction, p, pc))
         tic4x_print_op (info, instruction, p, pc);
       else
-        (*info->fprintf_func) (info->stream, "%08x", instruction);
+        (*info->fprintf_func) (info->stream, "%08lx", instruction);
     }
   else
     {
@@ -736,7 +740,7 @@ tic4x_disassemble (unsigned long pc,
             break;
           }
       if (i == TIC4X_SPESOP_SIZE)
-        (*info->fprintf_func) (info->stream, "%08x", instruction);
+        (*info->fprintf_func) (info->stream, "%08lx", instruction);
     }
 
   /* Return size of insn in words.  */