Convert to C90.

12 files changed, 150 insertions, 138 deletions

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 5b27060..c0e95d5 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,17 @@
+2003-08-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* alpha.h: Remove PARAMS macro.
+	* arc.h: Likewise.
+	* d10v.h: Likewise.
+	* d30v.h: Likewise.
+	* i370.h: Likewise.
+	* or32.h: Likewise.
+	* pj.h: Likewise.
+	* ppc.h: Likewise.
+	* sparc.h: Likewise.
+	* tic80.h: Likewise.
+	* v850.h: Likewise.
+
 2003-07-18  Michael Snyder  <msnyder@redhat.com>
 
 	* include/opcode/h8sx.h (DO_MOVA1, DO_MOVA2): Reformatting.
diff --git a/include/opcode/alpha.h b/include/opcode/alpha.h
index 487b696..efe1626 100644
--- a/include/opcode/alpha.h
+++ b/include/opcode/alpha.h
@@ -1,5 +1,5 @@
 /* alpha.h -- Header file for Alpha opcode table
-   Copyright 1996, 1999 Free Software Foundation, Inc.
+   Copyright 1996, 1999, 2001, 2003 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@tamu.edu>,
    patterned after the PPC opcode table written by Ian Lance Taylor.
 
@@ -108,8 +108,7 @@ struct alpha_operand
      string (the operand will be inserted in any case).  If the
      operand value is legal, *ERRMSG will be unchanged (most operands
      can accept any value).  */
-  unsigned (*insert) PARAMS ((unsigned instruction, int op,
-			      const char **errmsg));
+  unsigned (*insert) (unsigned instruction, int op, const char **errmsg);
 
   /* Extraction function.  This is used by the disassembler.  To
      extract this operand type from an instruction, check this field.
@@ -128,7 +127,7 @@ struct alpha_operand
      non-zero if this operand type can not actually be extracted from
      this operand (i.e., the instruction does not match).  If the
      operand is valid, *INVALID will not be changed.  */
-  int (*extract) PARAMS ((unsigned instruction, int *invalid));
+  int (*extract) (unsigned instruction, int *invalid);
 };
 
 /* Elements in the table are retrieved by indexing with values from
diff --git a/include/opcode/arc.h b/include/opcode/arc.h
index 3da68ec..629979d 100644
--- a/include/opcode/arc.h
+++ b/include/opcode/arc.h
@@ -1,5 +1,6 @@
 /* Opcode table for the ARC.
-   Copyright 1994, 1995, 1997, 2001 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1997, 2001, 2002, 2003
+   Free Software Foundation, Inc.
    Contributed by Doug Evans (dje@cygnus.com).
 
    This file is part of GAS, the GNU Assembler, GDB, the GNU debugger, and
@@ -17,7 +18,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GAS or GDB; see the file COPYING.	If not, write to
-   the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA.  */
 
 
 /* List of the various cpu types.
@@ -226,10 +228,9 @@ struct arc_operand {
 
    REG is non-NULL when inserting a register value.  */
 
-  arc_insn (*insert) PARAMS ((arc_insn insn,
-			      const struct arc_operand *operand, int mods,
-			      const struct arc_operand_value *reg, long value,
-			      const char **errmsg));
+  arc_insn (*insert)
+    (arc_insn insn, const struct arc_operand *operand, int mods,
+     const struct arc_operand_value *reg, long value, const char **errmsg);
 
 /* Extraction function.  This is used by the disassembler.  To
    extract this operand type from an instruction, check this field.
@@ -255,10 +256,9 @@ struct arc_operand {
    Operands that have a printable form like registers and suffixes have
    their struct arc_operand_value pointer stored in OPVAL.  */
 
-  long (*extract) PARAMS ((arc_insn *insn,
-			   const struct arc_operand *operand,
-			   int mods, const struct arc_operand_value **opval,
-			   int *invalid));
+  long (*extract)
+    (arc_insn *insn, const struct arc_operand *operand, int mods,
+     const struct arc_operand_value **opval, int *invalid);
 };
 
 /* Bits that say what version of cpu we have. These should be passed to
@@ -302,22 +302,22 @@ extern const int arc_reg_names_count;
 extern unsigned char arc_operand_map[];
 
 /* Utility fns in arc-opc.c.  */
-int arc_get_opcode_mach PARAMS ((int, int));
+int arc_get_opcode_mach (int, int);
 
 /* `arc_opcode_init_tables' must be called before `arc_xxx_supported'.  */
-void arc_opcode_init_tables PARAMS ((int));
-void arc_opcode_init_insert PARAMS ((void));
-void arc_opcode_init_extract PARAMS ((void));
-const struct arc_opcode *arc_opcode_lookup_asm PARAMS ((const char *));
-const struct arc_opcode *arc_opcode_lookup_dis PARAMS ((unsigned int));
-int arc_opcode_limm_p PARAMS ((long *));
+void arc_opcode_init_tables (int);
+void arc_opcode_init_insert (void);
+void arc_opcode_init_extract (void);
+const struct arc_opcode *arc_opcode_lookup_asm (const char *);
+const struct arc_opcode *arc_opcode_lookup_dis (unsigned int);
+int arc_opcode_limm_p (long *);
 const struct arc_operand_value *arc_opcode_lookup_suffix
-  PARAMS ((const struct arc_operand *type, int value));
-int arc_opcode_supported PARAMS ((const struct arc_opcode *));
-int arc_opval_supported PARAMS ((const struct arc_operand_value *));
-int arc_limm_fixup_adjust PARAMS ((arc_insn));
-int arc_insn_is_j PARAMS ((arc_insn));
-int arc_insn_not_jl PARAMS ((arc_insn));
-int arc_operand_type PARAMS ((int));
-struct arc_operand_value *get_ext_suffix PARAMS ((char *));
-int arc_get_noshortcut_flag PARAMS ((void));
+  (const struct arc_operand *type, int value);
+int arc_opcode_supported (const struct arc_opcode *);
+int arc_opval_supported (const struct arc_operand_value *);
+int arc_limm_fixup_adjust (arc_insn);
+int arc_insn_is_j (arc_insn);
+int arc_insn_not_jl (arc_insn);
+int arc_operand_type (int);
+struct arc_operand_value *get_ext_suffix (char *);
+int arc_get_noshortcut_flag (void);
diff --git a/include/opcode/d10v.h b/include/opcode/d10v.h
index cc27850..74d9006 100644
--- a/include/opcode/d10v.h
+++ b/include/opcode/d10v.h
@@ -1,5 +1,6 @@
 /* d10v.h -- Header file for D10V opcode table
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003
+   Free Software Foundation, Inc.
    Written by Martin Hunt (hunt@cygnus.com), Cygnus Support
 
 This file is part of GDB, GAS, and the GNU binutils.
@@ -198,7 +199,7 @@ struct pd_reg
 };
 
 extern const struct pd_reg d10v_predefined_registers[];
-int d10v_reg_name_cnt PARAMS ((void));
+int d10v_reg_name_cnt (void);
 
 /* an expressionS only has one register type, so we fake it */
 /* by setting high bits to indicate type */
diff --git a/include/opcode/d30v.h b/include/opcode/d30v.h
index c18874b..809bdeb 100644
--- a/include/opcode/d30v.h
+++ b/include/opcode/d30v.h
@@ -1,5 +1,5 @@
 /* d30v.h -- Header file for D30V opcode table
-   Copyright 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1997, 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
    Written by Martin Hunt (hunt@cygnus.com), Cygnus Solutions
 
 This file is part of GDB, GAS, and the GNU binutils.
@@ -32,7 +32,7 @@ struct pd_reg
 };
 
 extern const struct pd_reg pre_defined_registers[];
-int reg_name_cnt PARAMS ((void));
+int reg_name_cnt (void);
 
 /* the number of control registers */
 #define MAX_CONTROL_REG	64
diff --git a/include/opcode/i370.h b/include/opcode/i370.h
index 155a3cf..e317f23 100644
--- a/include/opcode/i370.h
+++ b/include/opcode/i370.h
@@ -1,5 +1,5 @@
 /* i370.h -- Header file for S/390 opcode table
-   Copyright 1994, 1995, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
    PowerPC version written by Ian Lance Taylor, Cygnus Support
    Rewritten for i370 ESA/390 support, Linas Vepstas <linas@linas.org>
 
@@ -159,8 +159,8 @@ struct i370_operand
      string (the operand will be inserted in any case).  If the
      operand value is legal, *ERRMSG will be unchanged (most operands
      can accept any value).  */
-  i370_insn_t (*insert) PARAMS ((i370_insn_t instruction, long op,
-				   const char **errmsg));
+  i370_insn_t (*insert)
+    (i370_insn_t instruction, long op, const char **errmsg);
 
   /* Extraction function.  This is used by the disassembler.  To
      extract this operand type from an instruction, check this field.
@@ -179,7 +179,7 @@ struct i370_operand
      non-zero if this operand type can not actually be extracted from
      this operand (i.e., the instruction does not match).  If the
      operand is valid, *INVALID will not be changed.  */
-  long (*extract) PARAMS ((i370_insn_t instruction, int *invalid));
+  long (*extract) (i370_insn_t instruction, int *invalid);
 
   /* One bit syntax flags.  */
   unsigned long flags;
diff --git a/include/opcode/or32.h b/include/opcode/or32.h
index 4609a48..d72b9bd 100644
--- a/include/opcode/or32.h
+++ b/include/opcode/or32.h
@@ -1,5 +1,5 @@
 /* Table of opcodes for the OpenRISC 1000 ISA.
-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright 2002, 2003 Free Software Foundation, Inc.
    Contributed by Damjan Lampret (lampret@opencores.org).
    
    This file is part of or1k_gen_isa, or1ksim, GDB and GAS.
@@ -27,10 +27,6 @@
 #define NUM_UNSIGNED (0)
 #define NUM_SIGNED (1)
 
-#ifndef PARAMS
-#define PARAMS(x) x
-#endif
-
 #define MAX_GPRS 32
 #define PAGE_SIZE 4096
 #undef __HALF_WORD_INSN__
@@ -71,7 +67,7 @@ struct or32_opcode
   
   /* Opcode and operand encoding.  */
   char *encoding;
-  void (*exec) PARAMS ((void));
+  void (*exec) (void);
   unsigned int flags;
 };
 
@@ -93,59 +89,59 @@ extern struct insn_op_struct
 } **op_start;
 
 #ifdef HAS_EXECUTION
-extern void l_invalid PARAMS ((void));
-extern void l_sfne    PARAMS ((void));
-extern void l_bf      PARAMS ((void));
-extern void l_add     PARAMS ((void));
-extern void l_sw      PARAMS ((void));
-extern void l_sb      PARAMS ((void));
-extern void l_sh      PARAMS ((void));
-extern void l_lwz     PARAMS ((void));
-extern void l_lbs     PARAMS ((void));
-extern void l_lbz     PARAMS ((void));
-extern void l_lhs     PARAMS ((void));
-extern void l_lhz     PARAMS ((void));
-extern void l_movhi   PARAMS ((void));
-extern void l_and     PARAMS ((void));
-extern void l_or      PARAMS ((void));
-extern void l_xor     PARAMS ((void));
-extern void l_sub     PARAMS ((void));
-extern void l_mul     PARAMS ((void));
-extern void l_div     PARAMS ((void));
-extern void l_divu    PARAMS ((void));
-extern void l_sll     PARAMS ((void));
-extern void l_sra     PARAMS ((void));
-extern void l_srl     PARAMS ((void));
-extern void l_j       PARAMS ((void));
-extern void l_jal     PARAMS ((void));
-extern void l_jalr    PARAMS ((void));
-extern void l_jr      PARAMS ((void));
-extern void l_rfe     PARAMS ((void));
-extern void l_nop     PARAMS ((void));
-extern void l_bnf     PARAMS ((void));
-extern void l_sfeq    PARAMS ((void));
-extern void l_sfgts   PARAMS ((void));
-extern void l_sfges   PARAMS ((void));
-extern void l_sflts   PARAMS ((void));
-extern void l_sfles   PARAMS ((void));
-extern void l_sfgtu   PARAMS ((void));
-extern void l_sfgeu   PARAMS ((void));
-extern void l_sfltu   PARAMS ((void));
-extern void l_sfleu   PARAMS ((void));
-extern void l_mtspr   PARAMS ((void));
-extern void l_mfspr   PARAMS ((void));
-extern void l_sys     PARAMS ((void));
-extern void l_trap    PARAMS ((void)); /* CZ 21/06/01.  */
-extern void l_macrc   PARAMS ((void));
-extern void l_mac     PARAMS ((void));
-extern void l_msb     PARAMS ((void));
-extern void l_invalid PARAMS ((void));
-extern void l_cust1   PARAMS ((void));
-extern void l_cust2   PARAMS ((void));
-extern void l_cust3   PARAMS ((void));
-extern void l_cust4   PARAMS ((void));
+extern void l_invalid (void);
+extern void l_sfne    (void);
+extern void l_bf      (void);
+extern void l_add     (void);
+extern void l_sw      (void);
+extern void l_sb      (void);
+extern void l_sh      (void);
+extern void l_lwz     (void);
+extern void l_lbs     (void);
+extern void l_lbz     (void);
+extern void l_lhs     (void);
+extern void l_lhz     (void);
+extern void l_movhi   (void);
+extern void l_and     (void);
+extern void l_or      (void);
+extern void l_xor     (void);
+extern void l_sub     (void);
+extern void l_mul     (void);
+extern void l_div     (void);
+extern void l_divu    (void);
+extern void l_sll     (void);
+extern void l_sra     (void);
+extern void l_srl     (void);
+extern void l_j       (void);
+extern void l_jal     (void);
+extern void l_jalr    (void);
+extern void l_jr      (void);
+extern void l_rfe     (void);
+extern void l_nop     (void);
+extern void l_bnf     (void);
+extern void l_sfeq    (void);
+extern void l_sfgts   (void);
+extern void l_sfges   (void);
+extern void l_sflts   (void);
+extern void l_sfles   (void);
+extern void l_sfgtu   (void);
+extern void l_sfgeu   (void);
+extern void l_sfltu   (void);
+extern void l_sfleu   (void);
+extern void l_mtspr   (void);
+extern void l_mfspr   (void);
+extern void l_sys     (void);
+extern void l_trap    (void); /* CZ 21/06/01.  */
+extern void l_macrc   (void);
+extern void l_mac     (void);
+extern void l_msb     (void);
+extern void l_invalid (void);
+extern void l_cust1   (void);
+extern void l_cust2   (void);
+extern void l_cust3   (void);
+extern void l_cust4   (void);
 #endif
-extern void l_none    PARAMS ((void));
+extern void l_none    (void);
 
 extern const struct or32_letter or32_letters[];
 
@@ -154,31 +150,31 @@ extern const struct  or32_opcode or32_opcodes[];
 extern const unsigned int or32_num_opcodes;
 
 /* Calculates instruction length in bytes.  Always 4 for OR32.  */
-extern int insn_len PARAMS ((int));
+extern int insn_len (int);
 
 /* Is individual insn's operand signed or unsigned?  */
-extern int letter_signed PARAMS ((char));
+extern int letter_signed (char);
 
 /* Number of letters in the individual lettered operand.  */
-extern int letter_range PARAMS ((char));
+extern int letter_range (char);
 
 /* MM: Returns index of given instruction name.  */
-extern int insn_index PARAMS ((char *));
+extern int insn_index (char *);
 
 /* MM: Returns instruction name from index.  */
-extern const char *insn_name PARAMS ((int));
+extern const char *insn_name (int);
 
 /* MM: Constructs new FSM, based on or32_opcodes.  */ 
-extern void build_automata PARAMS ((void));
+extern void build_automata (void);
 
 /* MM: Destructs FSM.  */ 
-extern void destruct_automata PARAMS ((void));
+extern void destruct_automata (void);
 
 /* MM: Decodes instruction using FSM.  Call build_automata first.  */
-extern int insn_decode PARAMS ((unsigned int));
+extern int insn_decode (unsigned int);
 
 /* Disassemble one instruction from insn to disassemble.
    Return the size of the instruction.  */
-int disassemble_insn PARAMS ((unsigned long));
+int disassemble_insn (unsigned long);
 
 #endif
diff --git a/include/opcode/pj.h b/include/opcode/pj.h
index 5779507..f9e44db 100644
--- a/include/opcode/pj.h
+++ b/include/opcode/pj.h
@@ -1,5 +1,5 @@
 /* Definitions for decoding the picoJava opcode table.
-   Copyright 1999 Free Software Foundation, Inc.
+   Copyright 1999, 2002, 2003 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
@@ -44,6 +44,6 @@ typedef struct pj_opc_info_t
   unsigned char arg[2];
   union {
     const char *name;
-    void (*func) PARAMS ((struct pj_opc_info_t *, char *));
+    void (*func) (struct pj_opc_info_t *, char *);
   } u;
 } pj_opc_info_t;
diff --git a/include/opcode/ppc.h b/include/opcode/ppc.h
index c4adf71..80b39cd 100644
--- a/include/opcode/ppc.h
+++ b/include/opcode/ppc.h
@@ -160,9 +160,8 @@ struct powerpc_operand
      string (the operand will be inserted in any case).  If the
      operand value is legal, *ERRMSG will be unchanged (most operands
      can accept any value).  */
-  unsigned long (*insert) PARAMS ((unsigned long instruction, long op,
-				   int dialect,
-				   const char **errmsg));
+  unsigned long (*insert)
+    (unsigned long instruction, long op, int dialect, const char **errmsg);
 
   /* Extraction function.  This is used by the disassembler.  To
      extract this operand type from an instruction, check this field.
@@ -181,8 +180,7 @@ struct powerpc_operand
      non-zero if this operand type can not actually be extracted from
      this operand (i.e., the instruction does not match).  If the
      operand is valid, *INVALID will not be changed.  */
-  long (*extract) PARAMS ((unsigned long instruction, int dialect,
-			   int *invalid));
+  long (*extract) (unsigned long instruction, int dialect, int *invalid);
 
   /* One bit syntax flags.  */
   unsigned long flags;
diff --git a/include/opcode/sparc.h b/include/opcode/sparc.h
index c412923..c336493 100644
--- a/include/opcode/sparc.h
+++ b/include/opcode/sparc.h
@@ -1,6 +1,6 @@
 /* Definitions for opcode table for the sparc.
-   Copyright 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2002
-   Free Software Foundation, Inc.
+   Copyright 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2002,
+   2003 Free Software Foundation, Inc.
 
 This file is part of GAS, the GNU Assembler, GDB, the GNU debugger, and
 the GNU Binutils.
@@ -74,8 +74,7 @@ struct sparc_opcode_arch {
 extern const struct sparc_opcode_arch sparc_opcode_archs[];
 
 /* Given architecture name, look up it's sparc_opcode_arch_val value.  */
-extern enum sparc_opcode_arch_val sparc_opcode_lookup_arch
-  PARAMS ((const char *));
+extern enum sparc_opcode_arch_val sparc_opcode_lookup_arch (const char *);
 
 /* Return the bitmask of supported architectures for ARCH.  */
 #define SPARC_OPCODE_SUPPORTED(ARCH) (sparc_opcode_archs[ARCH].supported)
@@ -223,14 +222,14 @@ The following chars are unused: (note: ,[] are used as punctuation)
 extern const struct sparc_opcode sparc_opcodes[];
 extern const int sparc_num_opcodes;
 
-extern int sparc_encode_asi PARAMS ((const char *));
-extern const char *sparc_decode_asi PARAMS ((int));
-extern int sparc_encode_membar PARAMS ((const char *));
-extern const char *sparc_decode_membar PARAMS ((int));
-extern int sparc_encode_prefetch PARAMS ((const char *));
-extern const char *sparc_decode_prefetch PARAMS ((int));
-extern int sparc_encode_sparclet_cpreg PARAMS ((const char *));
-extern const char *sparc_decode_sparclet_cpreg PARAMS ((int));
+extern int sparc_encode_asi (const char *);
+extern const char *sparc_decode_asi (int);
+extern int sparc_encode_membar (const char *);
+extern const char *sparc_decode_membar (int);
+extern int sparc_encode_prefetch (const char *);
+extern const char *sparc_decode_prefetch (int);
+extern int sparc_encode_sparclet_cpreg (const char *);
+extern const char *sparc_decode_sparclet_cpreg (int);
 
 /*
  * Local Variables:
diff --git a/include/opcode/tic80.h b/include/opcode/tic80.h
index 01159e4..c6a79df 100644
--- a/include/opcode/tic80.h
+++ b/include/opcode/tic80.h
@@ -1,5 +1,5 @@
 /* tic80.h -- Header file for TI TMS320C80 (MV) opcode table
-   Copyright 1996, 1997 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 2003 Free Software Foundation, Inc.
    Written by Fred Fish (fnf@cygnus.com), Cygnus Support
 
 This file is part of GDB, GAS, and the GNU binutils.
@@ -90,8 +90,8 @@ struct tic80_operand
      operand value is legal, *ERRMSG will be unchanged (most operands
      can accept any value).  */
 
-  unsigned long (*insert) PARAMS ((unsigned long instruction, long op,
-				   const char **errmsg));
+  unsigned long (*insert)
+    (unsigned long instruction, long op, const char **errmsg);
 
   /* Extraction function.  This is used by the disassembler.  To
      extract this operand type from an instruction, check this field.
@@ -111,7 +111,7 @@ struct tic80_operand
      this operand (i.e., the instruction does not match).  If the
      operand is valid, *INVALID will not be changed.  */
 
-  long (*extract) PARAMS ((unsigned long instruction, int *invalid));
+  long (*extract) (unsigned long instruction, int *invalid);
 
   /* One bit syntax flags.  */
 
@@ -265,13 +265,18 @@ struct predefined_symbol
 #define PDS_NAME(pdsp) ((pdsp) -> name)
 #define PDS_VALUE(pdsp) ((pdsp) -> value)
 
-extern const struct predefined_symbol tic80_predefined_symbols[];	/* Translation array */
-extern const int tic80_num_predefined_symbols;				/* How many members in the array */
+/* Translation array.  */
+extern const struct predefined_symbol tic80_predefined_symbols[];
+/* How many members in the array.  */
+extern const int tic80_num_predefined_symbols;
 
-const char *tic80_value_to_symbol PARAMS ((int val, int class));	/* Translate value to symbolic name */
-int tic80_symbol_to_value PARAMS ((char *name, int class));		/* Translate symbolic name to value */
+/* Translate value to symbolic name.  */
+const char *tic80_value_to_symbol (int val, int class);
 
-const struct predefined_symbol *
-tic80_next_predefined_symbol PARAMS ((const struct predefined_symbol *));
+/* Translate symbolic name to value.  */
+int tic80_symbol_to_value (char *name, int class);
+
+const struct predefined_symbol *tic80_next_predefined_symbol
+  (const struct predefined_symbol *);
 
 #endif /* TIC80_H */
diff --git a/include/opcode/v850.h b/include/opcode/v850.h
index 2183bc8..f6a1eb4 100644
--- a/include/opcode/v850.h
+++ b/include/opcode/v850.h
@@ -1,5 +1,5 @@
 /* v850.h -- Header file for NEC V850 opcode table
-   Copyright 1996, 1997, 2001 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 2001, 2003 Free Software Foundation, Inc.
    Written by J.T. Conklin, Cygnus Support
 
 This file is part of GDB, GAS, and the GNU binutils.
@@ -95,8 +95,8 @@ struct v850_operand
      string (the operand will be inserted in any case).  If the
      operand value is legal, *ERRMSG will be unchanged (most operands
      can accept any value).  */
-  unsigned long (* insert) PARAMS ((unsigned long instruction, long op,
-				   const char ** errmsg));
+  unsigned long (* insert)
+    (unsigned long instruction, long op, const char ** errmsg);
 
   /* Extraction function.  This is used by the disassembler.  To
      extract this operand type from an instruction, check this field.
@@ -114,7 +114,7 @@ struct v850_operand
      non-zero if this operand type can not actually be extracted from
      this operand (i.e., the instruction does not match).  If the
      operand is valid, *INVALID will not be changed.  */
-  unsigned long (* extract) PARAMS ((unsigned long instruction, int * invalid));
+  unsigned long (* extract) (unsigned long instruction, int * invalid);
 
   /* One bit syntax flags.  */
   int flags;