Update function declarations to ISO C90 formatting

1 files changed, 161 insertions, 230 deletions

diff --git a/opcodes/cris-dis.c b/opcodes/cris-dis.c
index 967d699..075cca7 100644
--- a/opcodes/cris-dis.c
+++ b/opcodes/cris-dis.c
@@ -3,21 +3,22 @@
    Contributed by Axis Communications AB, Lund, Sweden.
    Written by Hans-Peter Nilsson.
 
-This file is part of the GNU binutils and GDB, the GNU debugger.
+   This file is part of the GNU binutils and GDB, the GNU debugger.
 
-This program 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, or (at your option)
-any later version.
+   This program 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, 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.
+   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.
 
-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.  */
+   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 "dis-asm.h"
 #include "sysdep.h"
@@ -92,56 +93,15 @@ static long no_of_case_offsets = 0;
 /* Candidate for next case_offset.  */
 static long last_immediate = 0;
 
-static int number_of_bits
-  PARAMS ((unsigned int));
-static char *format_hex
-  PARAMS ((unsigned long, char *, struct cris_disasm_data *));
-static char *format_dec
-  PARAMS ((long, char *, int));
-static char *format_reg
-  PARAMS ((struct cris_disasm_data *, int, char *, bfd_boolean));
-static char *format_sup_reg
-  PARAMS ((unsigned int, char *, bfd_boolean));
 static int cris_constraint
-  PARAMS ((const char *, unsigned int, unsigned int,
-	   struct cris_disasm_data *));
-static unsigned bytes_to_skip
-  PARAMS ((unsigned int, const struct cris_opcode *,
-	   enum cris_disass_family));
-static char *print_flags
-  PARAMS ((struct cris_disasm_data *, unsigned int, char *));
-static void print_with_operands
-  PARAMS ((const struct cris_opcode *, unsigned int, unsigned char *,
-	   bfd_vma, disassemble_info *, const struct cris_opcode *,
-	   unsigned int, unsigned char *, bfd_boolean));
-static const struct cris_spec_reg *spec_reg_info
-  PARAMS ((unsigned int, enum cris_disass_family));
-static int print_insn_cris_generic
-  PARAMS ((bfd_vma, disassemble_info *, bfd_boolean));
-static int print_insn_cris_with_register_prefix
-  PARAMS ((bfd_vma, disassemble_info *));
-static int print_insn_cris_without_register_prefix
-  PARAMS ((bfd_vma, disassemble_info *));
-static int print_insn_crisv32_with_register_prefix
-  PARAMS ((bfd_vma, disassemble_info *));
-static int print_insn_crisv32_without_register_prefix
-  PARAMS ((bfd_vma, disassemble_info *));
-static int print_insn_crisv10_v32_with_register_prefix
-  PARAMS ((bfd_vma, disassemble_info *));
-static int print_insn_crisv10_v32_without_register_prefix
-  PARAMS ((bfd_vma, disassemble_info *));
-static bfd_boolean cris_parse_disassembler_options
-  PARAMS ((disassemble_info *, enum cris_disass_family));
-static const struct cris_opcode *get_opcode_entry
-  PARAMS ((unsigned int, unsigned int, struct cris_disasm_data *));
+  (const char *, unsigned, unsigned, struct cris_disasm_data *);
 
 /* Parse disassembler options and store state in info.  FIXME: For the
    time being, we abuse static variables.  */
 
 static bfd_boolean
-cris_parse_disassembler_options (info, distype)
-     disassemble_info *info;
-     enum cris_disass_family distype;
+cris_parse_disassembler_options (disassemble_info *info,
+				 enum cris_disass_family distype)
 {
   struct cris_disasm_data *disdata;
 
@@ -159,13 +119,11 @@ cris_parse_disassembler_options (info, distype)
   return TRUE;
 }
 
-
 static const struct cris_spec_reg *
-spec_reg_info (sreg, distype)
-     unsigned int sreg;
-     enum cris_disass_family distype;
+spec_reg_info (unsigned int sreg, enum cris_disass_family distype)
 {
   int i;
+
   for (i = 0; cris_spec_regs[i].name != NULL; i++)
     {
       if (cris_spec_regs[i].number == sreg)
@@ -196,8 +154,7 @@ spec_reg_info (sreg, distype)
 /* Return the number of bits in the argument.  */
 
 static int
-number_of_bits (val)
-     unsigned int val;
+number_of_bits (unsigned int val)
 {
   int bits;
 
@@ -210,10 +167,9 @@ number_of_bits (val)
 /* Get an entry in the opcode-table.  */
 
 static const struct cris_opcode *
-get_opcode_entry (insn, prefix_insn, disdata)
-     unsigned int insn;
-     unsigned int prefix_insn;
-     struct cris_disasm_data *disdata;
+get_opcode_entry (unsigned int insn,
+		  unsigned int prefix_insn,
+		  struct cris_disasm_data *disdata)
 {
   /* For non-prefixed insns, we keep a table of pointers, indexed by the
      insn code.  Each entry is initialized when found to be NULL.  */
@@ -440,121 +396,21 @@ get_opcode_entry (insn, prefix_insn, disdata)
   return max_matchedp;
 }
 
-/* Format number as hex with a leading "0x" into outbuffer.  */
-
-static char *
-format_hex (number, outbuffer, disdata)
-     unsigned long number;
-     char *outbuffer;
-     struct cris_disasm_data *disdata;
-{
-  /* Truncate negative numbers on >32-bit hosts.  */
-  number &= 0xffffffff;
-
-  sprintf (outbuffer, "0x%lx", number);
-
-  /* Save this value for the "case" support.  */
-  if (TRACE_CASE)
-    last_immediate = number;
-
-  return outbuffer + strlen (outbuffer);
-}
-
-/* Format number as decimal into outbuffer.  Parameter signedp says
-   whether the number should be formatted as signed (!= 0) or
-   unsigned (== 0).  */
-
-static char *
-format_dec (number, outbuffer, signedp)
-     long number;
-     char *outbuffer;
-     int signedp;
-{
-  last_immediate = number;
-  sprintf (outbuffer, signedp ? "%ld" : "%lu", number);
-
-  return outbuffer + strlen (outbuffer);
-}
-
-/* Format the name of the general register regno into outbuffer.  */
-
-static char *
-format_reg (disdata, regno, outbuffer_start, with_reg_prefix)
-     struct cris_disasm_data *disdata;
-     int regno;
-     char *outbuffer_start;
-     bfd_boolean with_reg_prefix;
-{
-  char *outbuffer = outbuffer_start;
-
-  if (with_reg_prefix)
-    *outbuffer++ = REGISTER_PREFIX_CHAR;
-
-  switch (regno)
-    {
-    case 15:
-      /* For v32, there is no context in which we output PC.  */
-      if (disdata->distype == cris_dis_v32)
-	strcpy (outbuffer, "acr");
-      else
-	strcpy (outbuffer, "pc");
-      break;
-
-    case 14:
-      strcpy (outbuffer, "sp");
-      break;
-
-    default:
-      sprintf (outbuffer, "r%d", regno);
-      break;
-    }
-
-  return outbuffer_start + strlen (outbuffer_start);
-}
-
-/* Format the name of a support register into outbuffer.  */
-
-static char *
-format_sup_reg (regno, outbuffer_start, with_reg_prefix)
-     unsigned int regno;
-     char *outbuffer_start;
-     bfd_boolean with_reg_prefix;
-{
-  char *outbuffer = outbuffer_start;
-  int i;
-
-  if (with_reg_prefix)
-    *outbuffer++ = REGISTER_PREFIX_CHAR;
-
-  for (i = 0; cris_support_regs[i].name != NULL; i++)
-    if (cris_support_regs[i].number == regno)
-      {
-	sprintf (outbuffer, "%s", cris_support_regs[i].name);
-	return outbuffer_start + strlen (outbuffer_start);
-      }
-
-  /* There's supposed to be register names covering all numbers, though
-     some may be generic names.  */
-  sprintf (outbuffer, "format_sup_reg-BUG");
-  return outbuffer_start + strlen (outbuffer_start);
-}
-
 /* Return -1 if the constraints of a bitwise-matched instruction say
    that there is no match.  Otherwise return a nonnegative number
    indicating the confidence in the match (higher is better).  */
 
 static int
-cris_constraint (cs, insn, prefix_insn, disdata)
-     const char *cs;
-     unsigned int insn;
-     unsigned int prefix_insn;
-     struct cris_disasm_data *disdata;
+cris_constraint (const char *cs,
+		 unsigned int insn,
+		 unsigned int prefix_insn,
+		 struct cris_disasm_data *disdata)
 {
   int retval = 0;
   int tmp;
   int prefix_ok = 0;
-
   const char *s;
+
   for (s = cs; *s; s++)
     switch (*s)
       {
@@ -697,13 +553,105 @@ cris_constraint (cs, insn, prefix_insn, disdata)
   return retval;
 }
 
+/* Format number as hex with a leading "0x" into outbuffer.  */
+
+static char *
+format_hex (unsigned long number,
+	    char *outbuffer,
+	    struct cris_disasm_data *disdata)
+{
+  /* Truncate negative numbers on >32-bit hosts.  */
+  number &= 0xffffffff;
+
+  sprintf (outbuffer, "0x%lx", number);
+
+  /* Save this value for the "case" support.  */
+  if (TRACE_CASE)
+    last_immediate = number;
+
+  return outbuffer + strlen (outbuffer);
+}
+
+/* Format number as decimal into outbuffer.  Parameter signedp says
+   whether the number should be formatted as signed (!= 0) or
+   unsigned (== 0).  */
+
+static char *
+format_dec (long number, char *outbuffer, int signedp)
+{
+  last_immediate = number;
+  sprintf (outbuffer, signedp ? "%ld" : "%lu", number);
+
+  return outbuffer + strlen (outbuffer);
+}
+
+/* Format the name of the general register regno into outbuffer.  */
+
+static char *
+format_reg (struct cris_disasm_data *disdata,
+	    int regno,
+	    char *outbuffer_start,
+	    bfd_boolean with_reg_prefix)
+{
+  char *outbuffer = outbuffer_start;
+
+  if (with_reg_prefix)
+    *outbuffer++ = REGISTER_PREFIX_CHAR;
+
+  switch (regno)
+    {
+    case 15:
+      /* For v32, there is no context in which we output PC.  */
+      if (disdata->distype == cris_dis_v32)
+	strcpy (outbuffer, "acr");
+      else
+	strcpy (outbuffer, "pc");
+      break;
+
+    case 14:
+      strcpy (outbuffer, "sp");
+      break;
+
+    default:
+      sprintf (outbuffer, "r%d", regno);
+      break;
+    }
+
+  return outbuffer_start + strlen (outbuffer_start);
+}
+
+/* Format the name of a support register into outbuffer.  */
+
+static char *
+format_sup_reg (unsigned int regno,
+		char *outbuffer_start,
+		bfd_boolean with_reg_prefix)
+{
+  char *outbuffer = outbuffer_start;
+  int i;
+
+  if (with_reg_prefix)
+    *outbuffer++ = REGISTER_PREFIX_CHAR;
+
+  for (i = 0; cris_support_regs[i].name != NULL; i++)
+    if (cris_support_regs[i].number == regno)
+      {
+	sprintf (outbuffer, "%s", cris_support_regs[i].name);
+	return outbuffer_start + strlen (outbuffer_start);
+      }
+
+  /* There's supposed to be register names covering all numbers, though
+     some may be generic names.  */
+  sprintf (outbuffer, "format_sup_reg-BUG");
+  return outbuffer_start + strlen (outbuffer_start);
+}
+
 /* Return the length of an instruction.  */
 
 static unsigned
-bytes_to_skip (insn, matchedp, distype)
-     unsigned int insn;
-     const struct cris_opcode *matchedp;
-     enum cris_disass_family distype;
+bytes_to_skip (unsigned int insn,
+	       const struct cris_opcode *matchedp,
+	       enum cris_disass_family distype)
 {
   /* Each insn is a word plus "immediate" operands.  */
   unsigned to_skip = 2;
@@ -750,10 +698,7 @@ bytes_to_skip (insn, matchedp, distype)
 /* Print condition code flags.  */
 
 static char *
-print_flags (disdata, insn, cp)
-     struct cris_disasm_data *disdata;
-     unsigned int insn;
-     char *cp;
+print_flags (struct cris_disasm_data *disdata, unsigned int insn, char *cp)
 {
   /* Use the v8 (Etrax 100) flag definitions for disassembly.
      The differences with v0 (Etrax 1..4) vs. Svinto are:
@@ -780,20 +725,18 @@ print_flags (disdata, insn, cp)
    supposed to be output as an address mode.  */
 
 static void
-print_with_operands (opcodep, insn, buffer, addr, info, prefix_opcodep,
-		     prefix_insn, prefix_buffer, with_reg_prefix)
-     const struct cris_opcode *opcodep;
-     unsigned int insn;
-     unsigned char *buffer;
-     bfd_vma addr;
-     disassemble_info *info;
-
-     /* If a prefix insn was before this insn (and is supposed to be
-	output as an address), here is a description of it.  */
-     const struct cris_opcode *prefix_opcodep;
-     unsigned int prefix_insn;
-     unsigned char *prefix_buffer;
-     bfd_boolean with_reg_prefix;
+print_with_operands (const struct cris_opcode *opcodep,
+		     unsigned int insn,
+		     unsigned char *buffer,
+		     bfd_vma addr,
+		     disassemble_info *info,
+		     /* If a prefix insn was before this insn (and is supposed
+			to be output as an address), here is a description of
+			it.  */
+		     const struct cris_opcode *prefix_opcodep,
+		     unsigned int prefix_insn,
+		     unsigned char *prefix_buffer,
+		     bfd_boolean with_reg_prefix)
 {
   /* Get a buffer of somewhat reasonable size where we store
      intermediate parts of the insn.  */
@@ -1420,15 +1363,13 @@ print_with_operands (opcodep, insn, buffer, addr, info, prefix_opcodep,
 
       /* It could also be an "add", if there are negative case-values.  */
       else if (strncmp (opcodep->name, "add", 3) == 0)
-	{
-	  /* The first case is the negated operand to the add.  */
-	  case_offset = -last_immediate;
-	}
+	/* The first case is the negated operand to the add.  */
+	case_offset = -last_immediate;
+
       /* A bound insn will tell us the number of cases.  */
       else if (strncmp (opcodep->name, "bound", 5) == 0)
-	{
-	  no_of_case_offsets = last_immediate + 1;
-	}
+	no_of_case_offsets = last_immediate + 1;
+
       /* A jump or jsr or branch breaks the chain of insns for a
 	 case-table, so assume default first-case again.  */
       else if (info->insn_type == dis_jsr
@@ -1444,10 +1385,9 @@ print_with_operands (opcodep, insn, buffer, addr, info, prefix_opcodep,
    WITH_REG_PREFIX.  */
 
 static int
-print_insn_cris_generic (memaddr, info, with_reg_prefix)
-     bfd_vma memaddr;
-     disassemble_info *info;
-     bfd_boolean with_reg_prefix;
+print_insn_cris_generic (bfd_vma memaddr,
+			 disassemble_info *info,
+			 bfd_boolean with_reg_prefix)
 {
   int nbytes;
   unsigned int insn;
@@ -1631,9 +1571,8 @@ print_insn_cris_generic (memaddr, info, with_reg_prefix)
 /* Disassemble, prefixing register names with `$'.  CRIS v0..v10.  */
 
 static int
-print_insn_cris_with_register_prefix (vma, info)
-     bfd_vma vma;
-     disassemble_info *info;
+print_insn_cris_with_register_prefix (bfd_vma vma,
+				      disassemble_info *info)
 {
   if (info->private_data == NULL
       && !cris_parse_disassembler_options (info, cris_dis_v0_v10))
@@ -1644,9 +1583,8 @@ print_insn_cris_with_register_prefix (vma, info)
 /* Disassemble, prefixing register names with `$'.  CRIS v32.  */
 
 static int
-print_insn_crisv32_with_register_prefix (vma, info)
-     bfd_vma vma;
-     disassemble_info *info;
+print_insn_crisv32_with_register_prefix (bfd_vma vma,
+					 disassemble_info *info)
 {
   if (info->private_data == NULL
       && !cris_parse_disassembler_options (info, cris_dis_v32))
@@ -1658,9 +1596,8 @@ print_insn_crisv32_with_register_prefix (vma, info)
    Common v10 and v32 subset.  */
 
 static int
-print_insn_crisv10_v32_with_register_prefix (vma, info)
-     bfd_vma vma;
-     disassemble_info *info;
+print_insn_crisv10_v32_with_register_prefix (bfd_vma vma,
+					     disassemble_info *info)
 {
   if (info->private_data == NULL
       && !cris_parse_disassembler_options (info, cris_dis_common_v10_v32))
@@ -1671,9 +1608,8 @@ print_insn_crisv10_v32_with_register_prefix (vma, info)
 /* Disassemble, no prefixes on register names.  CRIS v0..v10.  */
 
 static int
-print_insn_cris_without_register_prefix (vma, info)
-     bfd_vma vma;
-     disassemble_info *info;
+print_insn_cris_without_register_prefix (bfd_vma vma,
+					 disassemble_info *info)
 {
   if (info->private_data == NULL
       && !cris_parse_disassembler_options (info, cris_dis_v0_v10))
@@ -1684,9 +1620,8 @@ print_insn_cris_without_register_prefix (vma, info)
 /* Disassemble, no prefixes on register names.  CRIS v32.  */
 
 static int
-print_insn_crisv32_without_register_prefix (vma, info)
-     bfd_vma vma;
-     disassemble_info *info;
+print_insn_crisv32_without_register_prefix (bfd_vma vma,
+					    disassemble_info *info)
 {
   if (info->private_data == NULL
       && !cris_parse_disassembler_options (info, cris_dis_v32))
@@ -1698,9 +1633,8 @@ print_insn_crisv32_without_register_prefix (vma, info)
    Common v10 and v32 subset.  */
 
 static int
-print_insn_crisv10_v32_without_register_prefix (vma, info)
-     bfd_vma vma;
-     disassemble_info *info;
+print_insn_crisv10_v32_without_register_prefix (bfd_vma vma,
+						disassemble_info *info)
 {
   if (info->private_data == NULL
       && !cris_parse_disassembler_options (info, cris_dis_common_v10_v32))
@@ -1714,8 +1648,7 @@ print_insn_crisv10_v32_without_register_prefix (vma, info)
    functions seen above.  */
 
 disassembler_ftype
-cris_get_disassembler (abfd)
-     bfd *abfd;
+cris_get_disassembler (bfd *abfd)
 {
   /* If there's no bfd in sight, we return what is valid as input in all
      contexts if fed back to the assembler: disassembly *with* register
@@ -1742,9 +1675,7 @@ cris_get_disassembler (abfd)
   return print_insn_cris_without_register_prefix;
 }
 
-/*
- * Local variables:
- * eval: (c-set-style "gnu")
- * indent-tabs-mode: t
- * End:
- */
+/* Local variables:
+   eval: (c-set-style "gnu")
+   indent-tabs-mode: t
+   End:  */