X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=opcodes%2Fpj-dis.c;h=b8b81a96a7ecc6e2b7aff130021d216ca4d3999e;hb=8eb59a907a65133ccaee3721060fa356bf722fb9;hp=c098295ba7df3ed023bec8bc9e1535cb875ffd67;hpb=abd8680d6efd97e7ba848a6392ee3ad72be18cd0;p=deliverable%2Fbinutils-gdb.git

diff --git a/opcodes/pj-dis.c b/opcodes/pj-dis.c
index c098295ba7..b8b81a96a7 100644
--- a/opcodes/pj-dis.c
+++ b/opcodes/pj-dis.c
@@ -1,5 +1,5 @@
 /* pj-dis.c -- Disassemble picoJava instructions.
-   Copyright (C) 1999 Free Software Foundation, Inc. 
+   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Steve Chamberlain, of Transmeta (sac@pobox.com).
 
 This program is free software; you can redistribute it and/or modify
@@ -16,14 +16,18 @@ 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 <stdio.h>
+#include "sysdep.h"
 #include "opcode/pj.h"
 #include "dis-asm.h"
 
 extern const pj_opc_info_t pj_opc_info[512];
 
-static int get_int (memaddr, iptr, info)
+static int get_int PARAMS ((bfd_vma, int *, struct disassemble_info *));
+
+
+static int
+get_int (memaddr, iptr, info)
      bfd_vma memaddr;
      int *iptr;
      struct disassemble_info *info;
@@ -32,10 +36,10 @@ static int get_int (memaddr, iptr, info)
 
   int status = info->read_memory_func (memaddr, ival, 4, info);
 
-  *iptr = (ival[0] << 24) 
-    | (ival[1] << 16) 
-    | (ival[2] << 8) 
-    | (ival[3] << 0) ;
+  *iptr = (ival[0] << 24)
+    | (ival[1] << 16)
+    | (ival[2] << 8)
+    | (ival[3] << 0);
 
   return status;
 }
@@ -71,7 +75,7 @@ print_insn_pj (addr, info)
       fprintf_fn (stream, "%s", op->name);
 
       /* The tableswitch instruction is followed by the default
-	 address, low value, high value and the destinations. */
+	 address, low value, high value and the destinations.  */
 
       if (strcmp (op->name, "tableswitch") == 0)
 	{
@@ -83,7 +87,7 @@ print_insn_pj (addr, info)
 	  if ((status = get_int (addr, &val, info)))
 	    goto fail;
 
-	  fprintf_fn (stream," default: ");
+	  fprintf_fn (stream, " default: ");
 	  (*info->print_address_func) (val + insn_start, info);
 	  addr += 4;
 
@@ -95,22 +99,23 @@ print_insn_pj (addr, info)
 	    goto fail;
 	  addr += 4;
 
-	  while (lowval <= highval) {
-	    if ((status = get_int (addr, &val, info)))
-	      goto fail;
-	    fprintf_fn (stream," %d:[", lowval);
-	    (*info->print_address_func) (val + insn_start, info);
-	    fprintf_fn (stream," ]");
-	    addr += 4;
-	    lowval++;
-	  }
+	  while (lowval <= highval)
+	    {
+	      if ((status = get_int (addr, &val, info)))
+		goto fail;
+	      fprintf_fn (stream, " %d:[", lowval);
+	      (*info->print_address_func) (val + insn_start, info);
+	      fprintf_fn (stream, " ]");
+	      addr += 4;
+	      lowval++;
+	    }
 	  return addr - insn_start;
 	}
 
       /* The lookupswitch instruction is followed by the default
 	 address, element count and pairs of values and
-	 addresses. */
-	    
+	 addresses.  */
+
       if (strcmp (op->name, "lookupswitch") == 0)
 	{
 	  int count;
@@ -121,26 +126,27 @@ print_insn_pj (addr, info)
 	    goto fail;
 	  addr += 4;
 
-	  fprintf_fn (stream," default: ");
+	  fprintf_fn (stream, " default: ");
 	  (*info->print_address_func) (val + insn_start, info);
 
 	  if ((status = get_int (addr, &count, info)))
 	    goto fail;
 	  addr += 4;
 
-	  while (count--) {
-	    if ((status = get_int (addr, &val, info)))
-	      goto fail;
-	    addr += 4;
-	    fprintf_fn (stream," %d:[", val);
+	  while (count--)
+	    {
+	      if ((status = get_int (addr, &val, info)))
+		goto fail;
+	      addr += 4;
+	      fprintf_fn (stream, " %d:[", val);
 
-	    if ((status = get_int (addr, &val, info)))
-	      goto fail;
-	    addr += 4;
+	      if ((status = get_int (addr, &val, info)))
+		goto fail;
+	      addr += 4;
 
-	    (*info->print_address_func) (val + insn_start, info);
-	    fprintf_fn (stream," ]");
-	  }
+	      (*info->print_address_func) (val + insn_start, info);
+	      fprintf_fn (stream, " ]");
+	    }
 	  return addr - insn_start;
 	}
       for (a = 0; op->arg[a]; a++)