* mcore-dis.c: Fix formatting.

	* mips-dis.c: Likewise.
	* pj-dis.c: Likewise.
	* z8k-dis.c: Likewise.

1 files changed, 41 insertions, 45 deletions

diff --git a/opcodes/mcore-dis.c b/opcodes/mcore-dis.c
index bbf0f977209..ad453186dc4 100644
--- a/opcodes/mcore-dis.c
+++ b/opcodes/mcore-dis.c
@@ -24,8 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "dis-asm.h"
 
 /* Mask for each mcore_opclass: */
-static const unsigned short imsk[] =
-{
+static const unsigned short imsk[] = {
     /* O0  */ 0xFFFF,
     /* OT  */ 0xFFFC,
     /* O1  */ 0xFFF0,
@@ -34,7 +33,7 @@ static const unsigned short imsk[] =
     /* X1  */ 0xFFF0,
     /* OI  */ 0xFE00,
     /* OB  */ 0xFE00,
-	      
+
     /* OMa */ 0xFFF0,
     /* SI  */ 0xFE00,
     /* I7  */ 0xF800,
@@ -43,7 +42,7 @@ static const unsigned short imsk[] =
     /* BL  */ 0xFF00,
     /* LR  */ 0xF000,
     /* LJ  */ 0xFF00,
-	      
+
     /* RM  */ 0xFFF0,
     /* RQ  */ 0xFFF0,
     /* JSR */ 0xFFF0,
@@ -52,33 +51,31 @@ static const unsigned short imsk[] =
     /* OBRb*/ 0xFF80,
     /* OBRc*/ 0xFF00,
     /* OBR2*/ 0xFE00,
-	      
+
     /* O1R1*/ 0xFFF0,
     /* OMb */ 0xFF80,
     /* OMc */ 0xFF00,
     /* SIa */ 0xFE00,
 
-  /* MULSH */ 0xFF00,    
+  /* MULSH */ 0xFF00,
   /* OPSR  */ 0xFFF8,   /* psrset/psrclr */
-		 
+
     /* JC  */ 0,		/* JC,JU,JL don't appear in object */
     /* JU  */ 0,
     /* JL  */ 0,
     /* RSI */ 0,
     /* DO21*/ 0,
-    /* OB2 */ 0 		/* OB2 won't appear in object. */
+    /* OB2 */ 0 		/* OB2 won't appear in object.  */
 };
 
-static const char * grname[] =
-{
+static const char *grname[] = {
  "r0",  "r1",  "r2",  "r3",  "r4",  "r5",  "r6",  "r7",
  "r8",  "r9", "r10", "r11", "r12", "r13", "r14", "r15"
 };
 
 static const char X[] = "??";
 
-static const char * crname[] =
-{
+static const char *crname[] = {
   "psr",  "vbr", "epsr", "fpsr", "epc",  "fpc",  "ss0",  "ss1",
   "ss2",  "ss3", "ss4",  "gcr",  "gsr",     X,      X,      X,
      X,      X,      X,      X,      X,     X,      X,      X,
@@ -87,10 +84,10 @@ static const char * crname[] =
 
 static const unsigned isiz[] = { 2, 0, 1, 0 };
 
-int 
+int
 print_insn_mcore (memaddr, info)
      bfd_vma memaddr;
-     struct disassemble_info * info;
+     struct disassemble_info *info;
 {
   unsigned char       ibytes[4];
   fprintf_ftype       fprintf = info->fprintf_func;
@@ -103,7 +100,7 @@ print_insn_mcore (memaddr, info)
 
   status = info->read_memory_func (memaddr, ibytes, 2, info);
 
-  if (status != 0) 
+  if (status != 0)
     {
       info->memory_error_func (status, memaddr, info);
       return -1;
@@ -117,7 +114,7 @@ print_insn_mcore (memaddr, info)
     abort ();
 
   /* Just a linear search of the table.  */
-  for (op = mcore_table; op->name != 0; op ++)
+  for (op = mcore_table; op->name != 0; op++)
     if (op->inst == (inst & imsk[op->opclass]))
       break;
 
@@ -125,10 +122,10 @@ print_insn_mcore (memaddr, info)
     fprintf (stream, ".short 0x%04x", inst);
   else
     {
-      const char * name = grname[inst & 0x0F];
-      
+      const char *name = grname[inst & 0x0F];
+
       fprintf (stream, "%s", op->name);
-      
+
       switch (op->opclass)
 	{
 	case O0: break;
@@ -157,21 +154,21 @@ print_insn_mcore (memaddr, info)
 	case LS: fprintf (stream, "\t%s, (%s, %d)", grname[(inst >> 8) & 0xF],
 			  name, ((inst >> 4) & 0xF) << isiz[(inst >> 13) & 3]);
 	  break;
-	  
+
 	case BR:
 	  {
 	    long val = inst & 0x3FF;
-	    
+
 	    if (inst & 0x400)
 	      val |= 0xFFFFFC00;
-	    
-	    fprintf (stream, "\t0x%x", memaddr + 2 + (val<<1));
-	    
+
+	    fprintf (stream, "\t0x%x", memaddr + 2 + (val << 1));
+
 	    if (strcmp (op->name, "bsr") == 0)
 	      {
 		/* For bsr, we'll try to get a symbol for the target.  */
 		val = memaddr + 2 + (val << 1);
-		
+
 		if (info->print_address_func && val != 0)
 		  {
 		    fprintf (stream, "\t// ");
@@ -180,36 +177,36 @@ print_insn_mcore (memaddr, info)
 	      }
 	  }
 	  break;
-	  
+
 	case BL:
 	  {
 	    long val;
 	    val = (inst & 0x000F);
 	    fprintf (stream, "\t%s, 0x%x",
-		    grname[(inst >> 4) & 0xF], memaddr - (val << 1));
+		     grname[(inst >> 4) & 0xF], memaddr - (val << 1));
 	  }
 	  break;
-	  
+
 	case LR:
 	  {
 	    unsigned long val;
-	    
+
 	    val = (memaddr + 2 + ((inst & 0xFF) << 2)) & 0xFFFFFFFC;
-	    
+
 	    status = info->read_memory_func (val, ibytes, 4, info);
-	    if (status != 0) 
+	    if (status != 0)
 	      {
 		info->memory_error_func (status, memaddr, info);
 		break;
 	      }
-	    
+
 	    if (info->endian == BFD_ENDIAN_LITTLE)
 	      val = (ibytes[3] << 24) | (ibytes[2] << 16)
 		| (ibytes[1] << 8) | (ibytes[0]);
 	    else
 	      val = (ibytes[0] << 24) | (ibytes[1] << 16)
 		| (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);
 
@@ -218,15 +215,15 @@ print_insn_mcore (memaddr, info)
 		       (memaddr + 2 + ((inst & 0xFF) << 2)) & 0xFFFFFFFC);
 	  }
 	  break;
-	  
+
 	case LJ:
 	  {
 	    unsigned long val;
-	    
+
 	    val = (memaddr + 2 + ((inst & 0xFF) << 2)) & 0xFFFFFFFC;
-	    
+
 	    status = info->read_memory_func (val, ibytes, 4, info);
-	    if (status != 0) 
+	    if (status != 0)
 	      {
 		info->memory_error_func (status, memaddr, info);
 		break;
@@ -238,7 +235,7 @@ print_insn_mcore (memaddr, info)
 	    else
 	      val = (ibytes[0] << 24) | (ibytes[1] << 16)
 		| (ibytes[2] << 8) | (ibytes[3]);
-	    
+
 	    /* Removed [] around literal value to match ABI syntax 12/95.  */
 	    fprintf (stream, "\t0x%X", val);
 	    /* For jmpi/jsri, we'll try to get a symbol for the target.  */
@@ -254,26 +251,25 @@ print_insn_mcore (memaddr, info)
 	      }
 	  }
 	  break;
-	  
+
 	case OPSR:
 	  {
-	    static char * fields[] = 
-	    {
-	      "af", "ie",    "fe",    "fe,ie", 
+	    static char *fields[] = {
+	      "af", "ie",    "fe",    "fe,ie",
 	      "ee", "ee,ie", "ee,fe", "ee,fe,ie"
 	    };
-	    
+
 	    fprintf (stream, "\t%s", fields[inst & 0x7]);
 	  }
 	  break;
-	  
+
 	default:
 	  /* If the disassembler lags the instruction set.  */
 	  fprintf (stream, "\tundecoded operands, inst is 0x%04x", inst);
 	  break;
 	}
     }
-  
+
   /* Say how many bytes we consumed.  */
   return 2;
 }