* m68k-dis.c: Fix formatting.

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

1 files changed, 36 insertions, 37 deletions

diff --git a/opcodes/m68k-dis.c b/opcodes/m68k-dis.c
index fd7d912aec1..0e9afb02f9a 100644
--- a/opcodes/m68k-dis.c
+++ b/opcodes/m68k-dis.c
@@ -37,7 +37,7 @@ static int
 fetch_arg PARAMS ((unsigned char *, int, int, disassemble_info *));
 
 static void
-print_base PARAMS ((int, bfd_vma, disassemble_info*));
+print_base PARAMS ((int, bfd_vma, disassemble_info *));
 
 static unsigned char *
 print_indexed PARAMS ((int, unsigned char *, bfd_vma, disassemble_info *));
@@ -46,24 +46,22 @@ static int
 print_insn_arg PARAMS ((const char *, unsigned char *, unsigned char *,
 			bfd_vma, disassemble_info *));
 
-CONST char * CONST fpcr_names[] =
-  {
+CONST char * CONST fpcr_names[] = {
     "", "%fpiar", "%fpsr", "%fpiar/%fpsr", "%fpcr",
     "%fpiar/%fpcr", "%fpsr/%fpcr", "%fpiar/%fpsr/%fpcr"
-  };
+};
 
-static char *const reg_names[] =
-  {
+static char *const reg_names[] = {
     "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",
     "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%fp", "%sp",
     "%ps", "%pc"
-  };
+};
 
 /* Sign-extend an (unsigned char). */
 #if __STDC__ == 1
-#define COERCE_SIGNED_CHAR(ch) ((signed char)(ch))
+#define COERCE_SIGNED_CHAR(ch) ((signed char) (ch))
 #else
-#define COERCE_SIGNED_CHAR(ch) ((int)(((ch) ^ 0x80) & 0xFF) - 128)
+#define COERCE_SIGNED_CHAR(ch) ((int) (((ch) ^ 0x80) & 0xFF) - 128)
 #endif
 
 /* Get a 1 byte signed integer.  */
@@ -107,15 +105,13 @@ static char *const reg_names[] =
    there should be a special case to handle this... */
 #define NEXTPACKED(p) \
   (p += 12, FETCH_DATA (info, p), 0.0)
-
 
 /* Maximum length of an instruction.  */
 #define MAXLEN 22
 
 #include <setjmp.h>
 
-struct private
-{
+struct private {
   /* Points to first byte not fetched.  */
   bfd_byte *max_fetched;
   bfd_byte the_buffer[MAXLEN];
@@ -127,7 +123,7 @@ struct private
    to ADDR (exclusive) are valid.  Returns 1 for success, longjmps
    on error.  */
 #define FETCH_DATA(info, addr) \
-  ((addr) <= ((struct private *)(info->private_data))->max_fetched \
+  ((addr) <= ((struct private *) (info->private_data))->max_fetched \
    ? 1 : fetch_data ((info), (addr)))
 
 static int
@@ -156,12 +152,15 @@ fetch_data (info, addr)
 /* This function is used to print to the bit-bucket. */
 static int
 #ifdef __STDC__
-dummy_printer (FILE * file ATTRIBUTE_UNUSED,
-	       const char * format ATTRIBUTE_UNUSED, ...)
+dummy_printer (FILE *file ATTRIBUTE_UNUSED,
+	       const char *format ATTRIBUTE_UNUSED, ...)
 #else
-dummy_printer (file) FILE *file ATTRIBUTE_UNUSED;
+dummy_printer (file)
+     FILE *file ATTRIBUTE_UNUSED;
 #endif
- { return 0; }
+{
+  return 0;
+}
 
 static void
 dummy_print_address (vma, info)
@@ -188,7 +187,7 @@ print_insn_m68k (memaddr, info)
   struct private priv;
   bfd_byte *buffer = priv.the_buffer;
   fprintf_ftype save_printer = info->fprintf_func;
-  void (*save_print_address) PARAMS((bfd_vma, struct disassemble_info*))
+  void (*save_print_address) PARAMS ((bfd_vma, struct disassemble_info *))
     = info->print_address_func;
   int major_opcode;
   static int numopcodes[16];
@@ -356,7 +355,7 @@ print_insn_m68k (memaddr, info)
 	{
 	  if (d[1] == 'l' && p - buffer < 6)
 	    p = buffer + 6;
-	  else if (p - buffer < 4 && d[1] != 'C' && d[1] != '8' )
+	  else if (p - buffer < 4 && d[1] != 'C' && d[1] != '8')
 	    p = buffer + 4;
 	}
       if ((d[0] == 'L' || d[0] == 'l') && d[1] == 'w' && p - buffer < 4)
@@ -415,8 +414,8 @@ print_insn_m68k (memaddr, info)
 
   save_p = p;
   info->print_address_func = dummy_print_address;
-  info->fprintf_func = (fprintf_ftype)dummy_printer;
-  for ( ; *d; d += 2)
+  info->fprintf_func = (fprintf_ftype) dummy_printer;
+  for (; *d; d += 2)
     {
       int eaten = print_insn_arg (d, buffer, p, memaddr + (p - buffer), info);
       if (eaten >= 0)
@@ -425,11 +424,11 @@ print_insn_m68k (memaddr, info)
 	goto invalid;
       else
 	{
-	  (*info->fprintf_func)(info->stream,
-				/* xgettext:c-format */
-				_("<internal error in opcode table: %s %s>\n"),
-				best->name,
-				best->args);
+	  (*info->fprintf_func) (info->stream,
+				 /* xgettext:c-format */
+				 _("<internal error in opcode table: %s %s>\n"),
+				 best->name,
+				 best->args);
 	  goto invalid;
 	}
 
@@ -501,7 +500,7 @@ print_insn_arg (d, buffer, p0, addr, info)
         (*info->fprintf_func)
 	  (info->stream,
 	   "%s@",
-	   reg_names [fetch_arg (buffer, place, 3, info) + 8]);
+	   reg_names[fetch_arg (buffer, place, 3, info) + 8]);
         break;
       }
 
@@ -625,7 +624,7 @@ print_insn_arg (d, buffer, p0, addr, info)
     case 'O':
       val = fetch_arg (buffer, place, 6, info);
       if (val & 0x20)
-	(*info->fprintf_func) (info->stream, "%s", reg_names [val & 7]);
+	(*info->fprintf_func) (info->stream, "%s", reg_names[val & 7]);
       else
 	(*info->fprintf_func) (info->stream, "%d", val);
       break;
@@ -650,7 +649,7 @@ print_insn_arg (d, buffer, p0, addr, info)
       else if (place == 'C')
 	{
 	  val = fetch_arg (buffer, place, 7, info);
-	  if ( val > 63 )		/* This is a signed constant. */
+	  if (val > 63)		/* This is a signed constant. */
 	    val -= 128;
 	  (*info->fprintf_func) (info->stream, "{#%d}", val);
 	}
@@ -684,7 +683,7 @@ print_insn_arg (d, buffer, p0, addr, info)
       if (place == 'b')
 	disp = NEXTBYTE (p);
       else if (place == 'B')
-	disp = COERCE_SIGNED_CHAR(buffer[1]);
+	disp = COERCE_SIGNED_CHAR (buffer[1]);
       else if (place == 'w' || place == 'W')
 	disp = NEXTWORD (p);
       else if (place == 'l' || place == 'L' || place == 'C')
@@ -818,7 +817,7 @@ print_insn_arg (d, buffer, p0, addr, info)
 
 	    case 4:
 	      flt_p = 1;	/* Assume it's a float... */
-	      switch( place )
+	      switch (place)
 	      {
 		case 'b':
 		  val = NEXTBYTE (p);
@@ -836,25 +835,25 @@ print_insn_arg (d, buffer, p0, addr, info)
 		  break;
 
 		case 'f':
-		  NEXTSINGLE(flval, p);
+		  NEXTSINGLE (flval, p);
 		  break;
 
 		case 'F':
-		  NEXTDOUBLE(flval, p);
+		  NEXTDOUBLE (flval, p);
 		  break;
 
 		case 'x':
-		  NEXTEXTEND(flval, p);
+		  NEXTEXTEND (flval, p);
 		  break;
 
 		case 'p':
-		  flval = NEXTPACKED(p);
+		  flval = NEXTPACKED (p);
 		  break;
 
 		default:
 		  return -1;
 	      }
-	      if ( flt_p )	/* Print a float? */
+	      if (flt_p)	/* Print a float? */
 		(*info->fprintf_func) (info->stream, "#%g", flval);
 	      else
 		(*info->fprintf_func) (info->stream, "#%d", val);
@@ -1206,7 +1205,7 @@ print_indexed (basereg, p, addr, info)
      disassemble_info *info;
 {
   register int word;
-  static char *const scales[] = {"", ":2", ":4", ":8"};
+  static char *const scales[] = { "", ":2", ":4", ":8" };
   bfd_vma base_disp;
   bfd_vma outer_disp;
   char buf[40];