* dis-asm.h: Declare cris_get_disassembler, not print_insn_cris.

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

diff --git a/opcodes/z8k-dis.c b/opcodes/z8k-dis.c
index 7123622a291cb49d5ec09a7a1d74e75ba2e2bb29..9621b3ee095f086ff3e327f7d7c0e0eff28894a7 100644 (file)
--- a/opcodes/z8k-dis.c
+++ b/opcodes/z8k-dis.c
@@ -1,5 +1,6 @@
 /* Disassemble z8000 code.
-   Copyright 1992, 1993, 1995, 1998 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1995, 1998, 2000
+   Free Software Foundation, Inc.
 
 This file is part of GNU Binutils.
 
@@ -17,16 +18,13 @@ 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.  */
 
-#include <ansidecl.h>
 #include "sysdep.h"
 #include "dis-asm.h"
 
 #define DEFINE_TABLE
 #include "z8k-opc.h"
-
 \f
 #include <setjmp.h>
-
 \f
 typedef struct
 {
@@ -68,7 +66,7 @@ fetch_data (info, nibble)
 {
   unsigned char mybuf[20];
   int status;
-  instr_data_s *priv = (instr_data_s *)info->private_data;
+  instr_data_s *priv = (instr_data_s *) info->private_data;
 
   if ((nibble % 4) != 0)
     abort ();
@@ -85,15 +83,15 @@ fetch_data (info, nibble)
 
   {
     int i;
-    unsigned char *p = mybuf ;
-    
+    unsigned char *p = mybuf;
+
     for (i = 0; i < nibble;)
       {
        priv->words[i] = (p[0] << 8) | p[1];
-       
+
        priv->bytes[i] = *p;
        priv->nibbles[i++] = *p >> 4;
-       priv->nibbles[i++] = *p &0xf;
+       priv->nibbles[i++] = *p & 0xf;
 
        ++p;
        priv->bytes[i] = *p;
@@ -127,7 +125,7 @@ static char *codes[16] =
   "nc/uge"
 };
 
-int z8k_lookup_instr PARAMS ((unsigned char*, disassemble_info *));
+int z8k_lookup_instr PARAMS ((unsigned char *, disassemble_info *));
 static void output_instr
   PARAMS ((instr_data_s *, unsigned long, disassemble_info *));
 static void unpack_instr PARAMS ((instr_data_s *, int, disassemble_info *));
@@ -197,7 +195,9 @@ z8k_lookup_instr (nibbles, info)
   while (!nibl_matched && z8k_table[tabl_index].name)
     {
       nibl_matched = 1;
-      for (nibl_index = 0; nibl_index < z8k_table[tabl_index].length * 2 && nibl_matched; nibl_index++)
+      for (nibl_index = 0;
+          nibl_index < z8k_table[tabl_index].length * 2 && nibl_matched;
+          nibl_index++)
        {
          if ((nibl_index % 4) == 0)
            /* Fetch one word at a time.  */
@@ -440,7 +440,7 @@ unpack_instr (instr_data, is_segmented, info)
          instr_data->interrupts = instr_nibl & 0x3;
          break;
        case CLASS_BIT:
-         /* do nothing */
+         /* Do nothing.  */
          break;
        case CLASS_IR:
          instr_data->arg_reg[datum_value] = instr_nibl;