remove PARAMS from sim

This removes the last uses of PARAMS from sim.

2014-01-06  Tom Tromey  <tromey@redhat.com>

	* README-HACKING: Don't use PARAMS.
	* arm/wrapper.c: Don't use PARAMS.
	* bfin/sim-main.h: Don't use PARAMS.
	* common/callback.c: Don't use PARAMS.
	* common/cgen-trace.c: Don't use PARAMS.
	* common/run-sim.h: Don't use PARAMS.
	* common/run.c: Don't use PARAMS.
	* common/sim-base.h: Don't use PARAMS.
	* common/sim-load.c: Don't use PARAMS.
	* common/sim-options.h: Don't use PARAMS.
	* common/sim-trace.c: Don't use PARAMS.
	* common/sim-trace.h: Don't use PARAMS.
	* common/sim-utils.h: Don't use PARAMS.
	* cr16/cr16_sim.h: Don't use PARAMS.
	* cr16/gencode.c: Don't use PARAMS.
	* cr16/interp.c: Don't use PARAMS.
	* cr16/simops.c: Don't use PARAMS.
	* d10v/d10v_sim.h: Don't use PARAMS.
	* d10v/gencode.c: Don't use PARAMS.
	* d10v/interp.c: Don't use PARAMS.
	* d10v/simops.c: Don't use PARAMS.
	* erc32/erc32.c: Don't use PARAMS.
	* erc32/exec.c: Don't use PARAMS.
	* erc32/float.c: Don't use PARAMS.
	* erc32/func.c: Don't use PARAMS.
	* erc32/sis.c: Don't use PARAMS.
	* erc32/sis.h: Don't use PARAMS.
	* mips/interp.c: Don't use PARAMS.
	* mips/sim-main.h: Don't use PARAMS.
	* sh/interp.c: Don't use PARAMS.
	* v850/sim-main.h: Don't use PARAMS.
	* v850/v850_sim.h: Don't use PARAMS.

10 files changed, 212 insertions, 212 deletions

diff --git a/sim/common/callback.c b/sim/common/callback.c
index f833f98..d7a046c 100644
--- a/sim/common/callback.c
+++ b/sim/common/callback.c
@@ -62,43 +62,43 @@
 /* ??? sim_cb_printf should be cb_printf, but until the callback support is
    broken out of the simulator directory, these are here to not require
    sim-utils.h.  */
-void sim_cb_printf PARAMS ((host_callback *, const char *, ...));
-void sim_cb_eprintf PARAMS ((host_callback *, const char *, ...));
+void sim_cb_printf (host_callback *, const char *, ...);
+void sim_cb_eprintf (host_callback *, const char *, ...);
 
 extern CB_TARGET_DEFS_MAP cb_init_syscall_map[];
 extern CB_TARGET_DEFS_MAP cb_init_errno_map[];
 extern CB_TARGET_DEFS_MAP cb_init_open_map[];
 
-extern int system PARAMS ((const char *));
-
-static int os_init PARAMS ((host_callback *));
-static int os_shutdown PARAMS ((host_callback *));
-static int os_unlink PARAMS ((host_callback *, const char *));
-static long os_time PARAMS ((host_callback *, long *));
-static int os_system PARAMS ((host_callback *, const char *));
-static int os_rename PARAMS ((host_callback *, const char *, const char *));
-static int os_write_stdout PARAMS ((host_callback *, const char *, int));
-static void os_flush_stdout PARAMS ((host_callback *));
-static int os_write_stderr PARAMS ((host_callback *, const char *, int));
-static void os_flush_stderr PARAMS ((host_callback *));
-static int os_write PARAMS ((host_callback *, int, const char *, int));
-static int os_read_stdin PARAMS ((host_callback *, char *, int));
-static int os_read PARAMS ((host_callback *, int, char *, int));
-static int os_open PARAMS ((host_callback *, const char *, int));
-static int os_lseek PARAMS ((host_callback *, int, long, int));
-static int os_isatty PARAMS ((host_callback *, int));
-static int os_get_errno PARAMS ((host_callback *));
-static int os_close PARAMS ((host_callback *, int));
-static void os_vprintf_filtered PARAMS ((host_callback *, const char *, va_list));
-static void os_evprintf_filtered PARAMS ((host_callback *, const char *, va_list));
-static void os_error PARAMS ((host_callback *, const char *, ...))
+extern int system (const char *);
+
+static int os_init (host_callback *);
+static int os_shutdown (host_callback *);
+static int os_unlink (host_callback *, const char *);
+static long os_time (host_callback *, long *);
+static int os_system (host_callback *, const char *);
+static int os_rename (host_callback *, const char *, const char *);
+static int os_write_stdout (host_callback *, const char *, int);
+static void os_flush_stdout (host_callback *);
+static int os_write_stderr (host_callback *, const char *, int);
+static void os_flush_stderr (host_callback *);
+static int os_write (host_callback *, int, const char *, int);
+static int os_read_stdin (host_callback *, char *, int);
+static int os_read (host_callback *, int, char *, int);
+static int os_open (host_callback *, const char *, int);
+static int os_lseek (host_callback *, int, long, int);
+static int os_isatty (host_callback *, int);
+static int os_get_errno (host_callback *);
+static int os_close (host_callback *, int);
+static void os_vprintf_filtered (host_callback *, const char *, va_list);
+static void os_evprintf_filtered (host_callback *, const char *, va_list);
+static void os_error (host_callback *, const char *, ...)
 #ifdef __GNUC__
   __attribute__ ((__noreturn__))
 #endif
   ;
-static int fdmap PARAMS ((host_callback *, int));
-static int fdbad PARAMS ((host_callback *, int));
-static int wrap PARAMS ((host_callback *, int));
+static int fdmap (host_callback *, int);
+static int fdbad (host_callback *, int);
+static int wrap (host_callback *, int);
 
 /* Set the callback copy of errno from what we see now.  */
 
diff --git a/sim/common/cgen-trace.c b/sim/common/cgen-trace.c
index 2f28215..6e2f856 100644
--- a/sim/common/cgen-trace.c
+++ b/sim/common/cgen-trace.c
@@ -299,7 +299,7 @@ cgen_trace_printf (SIM_CPU *cpu, char *fmt, ...)
 /* sprintf to a "stream" */
 
 int
-sim_disasm_sprintf VPARAMS ((SFILE *f, const char *format, ...))
+sim_disasm_sprintf (SFILE *f, const char *format, ...)
 {
 #ifndef __STDC__
   SFILE *f;
diff --git a/sim/common/run-sim.h b/sim/common/run-sim.h
index 6f0007d..be10d49 100644
--- a/sim/common/run-sim.h
+++ b/sim/common/run-sim.h
@@ -26,11 +26,11 @@
   /* Parse the command line, extracting any target specific switches
      before the generic simulator code gets a chance to complain
      about them.  Returns the adjusted value of argc.  */
-int sim_target_parse_command_line PARAMS ((int, char **));
+int sim_target_parse_command_line (int, char **);
 
   /* Display a list of target specific switches supported by this
      target.  */
-void sim_target_display_usage PARAMS ((int help));
+void sim_target_display_usage (int help);
 
 #endif
 
@@ -40,7 +40,7 @@ void sim_target_display_usage PARAMS ((int help));
    This procedure does not take a SIM_DESC argument as it is
    used before sim_open. */
 
-void sim_set_callbacks PARAMS ((struct host_callback_struct *));
+void sim_set_callbacks (struct host_callback_struct *);
 
 
 /* Set the size of the simulator memory array.
@@ -49,7 +49,7 @@ void sim_set_callbacks PARAMS ((struct host_callback_struct *));
    This procedure does not take a SIM_DESC argument as it is
    used before sim_open. */
 
-void sim_size PARAMS ((int i));
+void sim_size (int i);
 
 
 /* Single-step simulator with tracing enabled.
@@ -60,7 +60,7 @@ void sim_size PARAMS ((int i));
    be continued using sim_trace() calls; ``1'' indicating that the
    simulation has finished. */
 
-int sim_trace PARAMS ((SIM_DESC sd));
+int sim_trace (SIM_DESC sd);
 
 
 /* Enable tracing.
@@ -70,7 +70,7 @@ int sim_trace PARAMS ((SIM_DESC sd));
    be continued using sim_trace() calls; ``1'' indicating that the
    simulation has finished. */
 
-void sim_set_trace PARAMS ((void));
+void sim_set_trace (void);
 
 
 /* Configure the size of the profile buffer.
@@ -79,7 +79,7 @@ void sim_set_trace PARAMS ((void));
    This procedure does not take a SIM_DESC argument as it is
    used before sim_open. */
 
-void sim_set_profile_size PARAMS ((int n));
+void sim_set_profile_size (int n);
 
 
 /* Kill the running program.
@@ -88,6 +88,6 @@ void sim_set_profile_size PARAMS ((int n));
    This procedure will be replaced as part of the introduction of
    multi-cpu simulators. */
 
-void sim_kill PARAMS ((SIM_DESC sd));
+void sim_kill (SIM_DESC sd);
 
 #endif
diff --git a/sim/common/run.c b/sim/common/run.c
index 191b512..cae2cb3 100644
--- a/sim/common/run.c
+++ b/sim/common/run.c
@@ -50,8 +50,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "run-sim.h"
 #include "version.h"
 
-static void usage PARAMS ((int help));
-static void print_version PARAMS ((void));
+static void usage (int help);
+static void print_version (void);
 extern int optind;
 extern char *optarg;
 
@@ -63,7 +63,7 @@ extern int getopt ();
 
 #ifdef NEED_UI_LOOP_HOOK
 /* Gdb foolery. This is only needed for gdb using a gui.  */
-int (*deprecated_ui_loop_hook) PARAMS ((int signo));
+int (*deprecated_ui_loop_hook) (int signo);
 #endif
 
 static SIM_DESC sd;
diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
index 76880fc..043c37b 100644
--- a/sim/common/sim-base.h
+++ b/sim/common/sim-base.h
@@ -244,7 +244,7 @@ typedef struct {
 } sim_state_base;
 
 /* Functions for allocating/freeing a sim_state.  */
-SIM_DESC sim_state_alloc PARAMS ((SIM_OPEN_KIND kind, host_callback *callback));
-void sim_state_free PARAMS ((SIM_DESC));
+SIM_DESC sim_state_alloc (SIM_OPEN_KIND kind, host_callback *callback);
+void sim_state_free (SIM_DESC);
 
 #endif /* SIM_BASE_H */
diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c
index e6e4e90..2e2b804 100644
--- a/sim/common/sim-load.c
+++ b/sim/common/sim-load.c
@@ -36,11 +36,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "gdb/callback.h"
 #include "gdb/remote-sim.h"
 
-static void eprintf PARAMS ((host_callback *, const char *, ...));
-static void xprintf PARAMS ((host_callback *, const char *, ...));
+static void eprintf (host_callback *, const char *, ...);
+static void xprintf (host_callback *, const char *, ...);
 static void report_transfer_performance
-  PARAMS ((host_callback *, unsigned long, time_t, time_t));
-static void xprintf_bfd_vma PARAMS ((host_callback *, bfd_vma));
+  (host_callback *, unsigned long, time_t, time_t);
+static void xprintf_bfd_vma (host_callback *, bfd_vma);
 
 /* Load program PROG into the simulator using the function DO_LOAD.
    If PROG_BFD is non-NULL, the file has already been opened.
@@ -169,7 +169,7 @@ sim_load_file (sd, myname, callback, prog, prog_bfd, verbose_p, lma_p, do_write)
 }
 
 static void
-xprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
+xprintf (host_callback *callback, const char *fmt, ...)
 {
   va_list ap;
 
@@ -181,7 +181,7 @@ xprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
 }
 
 static void
-eprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
+eprintf (host_callback *callback, const char *fmt, ...)
 {
   va_list ap;
 
diff --git a/sim/common/sim-options.h b/sim/common/sim-options.h
index eea7e99..778f4c1 100644
--- a/sim/common/sim-options.h
+++ b/sim/common/sim-options.h
@@ -33,10 +33,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
    argument, NULL if optional and missing; arg#5 is nonzero if a
    command is being interpreted. */
 
-typedef SIM_RC (OPTION_HANDLER) PARAMS ((SIM_DESC, sim_cpu *, int, char *, int));
+typedef SIM_RC (OPTION_HANDLER) (SIM_DESC, sim_cpu *, int, char *, int);
 
 /* Declare option handlers with a macro so it's usable on k&r systems.  */
-#define DECLARE_OPTION_HANDLER(fn) SIM_RC fn PARAMS ((SIM_DESC, sim_cpu *, int, char *, int))
+#define DECLARE_OPTION_HANDLER(fn) SIM_RC fn (SIM_DESC, sim_cpu *, int, char *, int)
 
 typedef struct {
 
@@ -129,20 +129,20 @@ typedef struct option_list {
 /* Add a set of options to the simulator.
    CPU is the cpu the options apply to or NULL for all cpus.
    TABLE is an array of OPTIONS terminated by a NULL `opt.name' entry.  */
-SIM_RC sim_add_option_table PARAMS ((SIM_DESC sd, sim_cpu *cpu, const OPTION *table));
+SIM_RC sim_add_option_table (SIM_DESC sd, sim_cpu *cpu, const OPTION *table);
 
 /* Install handler for the standard options.  */
 MODULE_INSTALL_FN standard_install;
 
 /* Called by sim_open to parse the arguments.  */
-SIM_RC sim_parse_args PARAMS ((SIM_DESC sd, char **argv));
+SIM_RC sim_parse_args (SIM_DESC sd, char **argv);
 
 /* Print help messages for the options.  IS_COMMAND is non-zero when
    this function is called from the command line interpreter. */
-void sim_print_help PARAMS ((SIM_DESC sd, int is_command));
+void sim_print_help (SIM_DESC sd, int is_command);
 
 /* Try to parse the command as if it is an option, Only fail when
    totally unsuccessful */
-SIM_RC sim_args_command PARAMS ((SIM_DESC sd, char *cmd));
+SIM_RC sim_args_command (SIM_DESC sd, char *cmd);
 
 #endif /* SIM_OPTIONS_H */
diff --git a/sim/common/sim-trace.c b/sim/common/sim-trace.c
index b91cfec..bb56db7 100644
--- a/sim/common/sim-trace.c
+++ b/sim/common/sim-trace.c
@@ -1300,7 +1300,7 @@ trace_one_insn (SIM_DESC sd, sim_cpu *cpu, address_word pc,
 }
 
 void
-trace_printf VPARAMS ((SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...))
+trace_printf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...)
 {
 #if !defined __STDC__ && !defined ALMOST_STDC
   SIM_DESC sd;
@@ -1322,7 +1322,7 @@ trace_printf VPARAMS ((SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...))
 }
 
 void
-debug_printf VPARAMS ((sim_cpu *cpu, const char *fmt, ...))
+debug_printf (sim_cpu *cpu, const char *fmt, ...)
 {
 #if !defined __STDC__ && !defined ALMOST_STDC
   sim_cpu *cpu;
diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h
index f8b50fc..5fb58e1 100644
--- a/sim/common/sim-trace.h
+++ b/sim/common/sim-trace.h
@@ -228,24 +228,24 @@ typedef struct _trace_data {
 
 /* Prime the trace buffers ready for any trace output.
    Must be called prior to any other trace operation */
-extern void trace_prefix PARAMS ((SIM_DESC sd,
-				  sim_cpu *cpu,
-				  sim_cia cia,
-				  address_word pc,
-				  int print_linenum_p,
-				  const char *file_name,
-				  int line_nr,
-				  const char *fmt,
-				  ...))
+extern void trace_prefix (SIM_DESC sd,
+			  sim_cpu *cpu,
+			  sim_cia cia,
+			  address_word pc,
+			  int print_linenum_p,
+			  const char *file_name,
+			  int line_nr,
+			  const char *fmt,
+			  ...)
        __attribute__((format (printf, 8, 9)));
 
 /* Generic trace print, assumes trace_prefix() has been called */
 
-extern void trace_generic PARAMS ((SIM_DESC sd,
-				   sim_cpu *cpu,
-				   int trace_idx,
-				   const char *fmt,
-				   ...))
+extern void trace_generic (SIM_DESC sd,
+			   sim_cpu *cpu,
+			   int trace_idx,
+			   const char *fmt,
+			   ...)
      __attribute__((format (printf, 4, 5)));
 
 typedef enum {
@@ -262,149 +262,149 @@ typedef enum {
 /* Trace a varying number of word sized inputs/outputs.  trace_result*
    must be called to close the trace operation. */
 
-extern void save_data PARAMS ((SIM_DESC sd,
-                               TRACE_DATA *data,
-                               data_fmt fmt,
-                               long size,
-                               const void *buf));
-
-extern void trace_input0 PARAMS ((SIM_DESC sd,
-				  sim_cpu *cpu,
-				  int trace_idx));
+extern void save_data (SIM_DESC sd,
+		       TRACE_DATA *data,
+		       data_fmt fmt,
+		       long size,
+		       const void *buf);
 
-extern void trace_input_word1 PARAMS ((SIM_DESC sd,
-				       sim_cpu *cpu,
-				       int trace_idx,
-				       unsigned_word d0));
+extern void trace_input0 (SIM_DESC sd,
+			  sim_cpu *cpu,
+			  int trace_idx);
 
-extern void trace_input_word2 PARAMS ((SIM_DESC sd,
-				       sim_cpu *cpu,
-				       int trace_idx,
-				       unsigned_word d0,
-				       unsigned_word d1));
+extern void trace_input_word1 (SIM_DESC sd,
+			       sim_cpu *cpu,
+			       int trace_idx,
+			       unsigned_word d0);
 
-extern void trace_input_word3 PARAMS ((SIM_DESC sd,
-				       sim_cpu *cpu,
-				       int trace_idx,
-				       unsigned_word d0,
-				       unsigned_word d1,
-				       unsigned_word d2));
+extern void trace_input_word2 (SIM_DESC sd,
+			       sim_cpu *cpu,
+			       int trace_idx,
+			       unsigned_word d0,
+			       unsigned_word d1);
 
-extern void trace_input_word4 PARAMS ((SIM_DESC sd,
+extern void trace_input_word3 (SIM_DESC sd,
 				       sim_cpu *cpu,
 				       int trace_idx,
 				       unsigned_word d0,
 				       unsigned_word d1,
-				       unsigned_word d2,
-				       unsigned_word d3));
-
-extern void trace_input_addr1 PARAMS ((SIM_DESC sd,
-				       sim_cpu *cpu,
-				       int trace_idx,
-				       address_word d0));
-
-extern void trace_input_bool1 PARAMS ((SIM_DESC sd,
-				       sim_cpu *cpu,
-				       int trace_idx,
-				       int d0));
-
-extern void trace_input_fp1 PARAMS ((SIM_DESC sd,
-				     sim_cpu *cpu,
-				     int trace_idx,
-				     fp_word f0));
-
-extern void trace_input_fp2 PARAMS ((SIM_DESC sd,
-				     sim_cpu *cpu,
-				     int trace_idx,
-				     fp_word f0,
-				     fp_word f1));
-
-extern void trace_input_fp3 PARAMS ((SIM_DESC sd,
-				     sim_cpu *cpu,
-				     int trace_idx,
-				     fp_word f0,
-				     fp_word f1,
-				     fp_word f2));
-
-extern void trace_input_fpu1 PARAMS ((SIM_DESC sd,
-				     sim_cpu *cpu,
-				     int trace_idx,
-				     struct _sim_fpu *f0));
-
-extern void trace_input_fpu2 PARAMS ((SIM_DESC sd,
-				     sim_cpu *cpu,
-				     int trace_idx,
-				     struct _sim_fpu *f0,
-				     struct _sim_fpu *f1));
-
-extern void trace_input_fpu3 PARAMS ((SIM_DESC sd,
-				     sim_cpu *cpu,
-				     int trace_idx,
-				     struct _sim_fpu *f0,
-				     struct _sim_fpu *f1,
-				     struct _sim_fpu *f2));
+				       unsigned_word d2);
+
+extern void trace_input_word4 (SIM_DESC sd,
+			       sim_cpu *cpu,
+			       int trace_idx,
+			       unsigned_word d0,
+			       unsigned_word d1,
+			       unsigned_word d2,
+			       unsigned_word d3);
+
+extern void trace_input_addr1 (SIM_DESC sd,
+			       sim_cpu *cpu,
+			       int trace_idx,
+			       address_word d0);
+
+extern void trace_input_bool1 (SIM_DESC sd,
+			       sim_cpu *cpu,
+			       int trace_idx,
+			       int d0);
+
+extern void trace_input_fp1 (SIM_DESC sd,
+			     sim_cpu *cpu,
+			     int trace_idx,
+			     fp_word f0);
+
+extern void trace_input_fp2 (SIM_DESC sd,
+			     sim_cpu *cpu,
+			     int trace_idx,
+			     fp_word f0,
+			     fp_word f1);
+
+extern void trace_input_fp3 (SIM_DESC sd,
+			     sim_cpu *cpu,
+			     int trace_idx,
+			     fp_word f0,
+			     fp_word f1,
+			     fp_word f2);
+
+extern void trace_input_fpu1 (SIM_DESC sd,
+			      sim_cpu *cpu,
+			      int trace_idx,
+			      struct _sim_fpu *f0);
+
+extern void trace_input_fpu2 (SIM_DESC sd,
+			      sim_cpu *cpu,
+			      int trace_idx,
+			      struct _sim_fpu *f0,
+			      struct _sim_fpu *f1);
+
+extern void trace_input_fpu3 (SIM_DESC sd,
+			      sim_cpu *cpu,
+			      int trace_idx,
+			      struct _sim_fpu *f0,
+			      struct _sim_fpu *f1,
+			      struct _sim_fpu *f2);
 
 /* Other trace_input{_<fmt><nr-inputs>} functions can go here */
 
-extern void trace_result0 PARAMS ((SIM_DESC sd,
-				   sim_cpu *cpu,
-				   int trace_idx));
-
-extern void trace_result_word1 PARAMS ((SIM_DESC sd,
-					sim_cpu *cpu,
-					int trace_idx,
-					unsigned_word r0));
-
-extern void trace_result_word2 PARAMS ((SIM_DESC sd,
-					sim_cpu *cpu,
-					int trace_idx,
-					unsigned_word r0,
-					unsigned_word r1));
+extern void trace_result0 (SIM_DESC sd,
+			   sim_cpu *cpu,
+			   int trace_idx);
+
+extern void trace_result_word1 (SIM_DESC sd,
+				sim_cpu *cpu,
+				int trace_idx,
+				unsigned_word r0);
+
+extern void trace_result_word2 (SIM_DESC sd,
+				sim_cpu *cpu,
+				int trace_idx,
+				unsigned_word r0,
+				unsigned_word r1);
+
+extern void trace_result_word4 (SIM_DESC sd,
+				sim_cpu *cpu,
+				int trace_idx,
+				unsigned_word r0,
+				unsigned_word r1,
+				unsigned_word r2,
+				unsigned_word r3);
+
+extern void trace_result_bool1 (SIM_DESC sd,
+				sim_cpu *cpu,
+				int trace_idx,
+				int r0);
+
+extern void trace_result_addr1 (SIM_DESC sd,
+				sim_cpu *cpu,
+				int trace_idx,
+				address_word r0);
+
+extern void trace_result_fp1 (SIM_DESC sd,
+			      sim_cpu *cpu,
+			      int trace_idx,
+			      fp_word f0);
+
+extern void trace_result_fp2 (SIM_DESC sd,
+			      sim_cpu *cpu,
+			      int trace_idx,
+			      fp_word f0,
+			      fp_word f1);
+
+extern void trace_result_fpu1 (SIM_DESC sd,
+			       sim_cpu *cpu,
+			       int trace_idx,
+			       struct _sim_fpu *f0);
+
+extern void trace_result_string1 (SIM_DESC sd,
+				  sim_cpu *cpu,
+				  int trace_idx,
+				  char *str0);
 
-extern void trace_result_word4 PARAMS ((SIM_DESC sd,
+extern void trace_result_word1_string1 (SIM_DESC sd,
 					sim_cpu *cpu,
 					int trace_idx,
 					unsigned_word r0,
-					unsigned_word r1,
-					unsigned_word r2,
-					unsigned_word r3));
-
-extern void trace_result_bool1 PARAMS ((SIM_DESC sd,
-					sim_cpu *cpu,
-					int trace_idx,
-					int r0));
-
-extern void trace_result_addr1 PARAMS ((SIM_DESC sd,
-					sim_cpu *cpu,
-					int trace_idx,
-					address_word r0));
-
-extern void trace_result_fp1 PARAMS ((SIM_DESC sd,
-				      sim_cpu *cpu,
-				      int trace_idx,
-				      fp_word f0));
-
-extern void trace_result_fp2 PARAMS ((SIM_DESC sd,
-				      sim_cpu *cpu,
-				      int trace_idx,
-				      fp_word f0,
-				      fp_word f1));
-
-extern void trace_result_fpu1 PARAMS ((SIM_DESC sd,
-				       sim_cpu *cpu,
-				       int trace_idx,
-				       struct _sim_fpu *f0));
-
-extern void trace_result_string1 PARAMS ((SIM_DESC sd,
-					  sim_cpu *cpu,
-					  int trace_idx,
-					  char *str0));
-
-extern void trace_result_word1_string1 PARAMS ((SIM_DESC sd,
-						sim_cpu *cpu,
-						int trace_idx,
-						unsigned_word r0,
-						char *s0));
+					char *s0);
 
 /* Other trace_result{_<type><nr-results>} */
 
@@ -555,21 +555,21 @@ do { \
 
 /* The function trace_one_insn has been replaced by the function pair
    trace_prefix() + trace_generic() */
-extern void trace_one_insn PARAMS ((SIM_DESC sd,
-				    sim_cpu * cpu,
-				    address_word cia,
-				    int print_linenum_p,
-				    const char *file_name,
-				    int line_nr,
-				    const char *unit,
-				    const char *fmt,
-				    ...))
+extern void trace_one_insn (SIM_DESC sd,
+			    sim_cpu * cpu,
+			    address_word cia,
+			    int print_linenum_p,
+			    const char *file_name,
+			    int line_nr,
+			    const char *unit,
+			    const char *fmt,
+			    ...)
      __attribute__((format (printf, 8, 9)));
 
-extern void trace_printf PARAMS ((SIM_DESC, sim_cpu *, const char *, ...))
+extern void trace_printf (SIM_DESC, sim_cpu *, const char *, ...)
      __attribute__((format (printf, 3, 4)));
 
-extern void trace_vprintf PARAMS ((SIM_DESC, sim_cpu *, const char *, va_list));
+extern void trace_vprintf (SIM_DESC, sim_cpu *, const char *, va_list);
 
 /* Debug support.
    This is included here because there isn't enough of it to justify
@@ -583,7 +583,7 @@ extern void trace_vprintf PARAMS ((SIM_DESC, sim_cpu *, const char *, va_list));
 /* Non-zero if "--debug-insn" specified.  */
 #define DEBUG_INSN_P(cpu) DEBUG_P (cpu, DEBUG_INSN_IDX)
 
-extern void debug_printf PARAMS ((sim_cpu *, const char *, ...))
+extern void debug_printf (sim_cpu *, const char *, ...)
      __attribute__((format (printf, 2, 3)));
 
 #endif /* SIM_TRACE_H */
diff --git a/sim/common/sim-utils.h b/sim/common/sim-utils.h
index 3f61e50..ddb19ab 100644
--- a/sim/common/sim-utils.h
+++ b/sim/common/sim-utils.h
@@ -60,8 +60,8 @@ SIM_RC sim_analyze_program (SIM_DESC sd, char *prog_name,
    write the program sections at LMA interpreted as a virtual address.
    This is still accommodated for backward compatibility reasons. */
 
-typedef int sim_write_fn PARAMS ((SIM_DESC sd, SIM_ADDR mem,
-				      const unsigned char *buf, int length));
+typedef int sim_write_fn (SIM_DESC sd, SIM_ADDR mem,
+			  const unsigned char *buf, int length);
 struct bfd *sim_load_file (SIM_DESC sd, const char *myname,
 			   host_callback *callback, char *prog,
 			   struct bfd *prog_bfd, int verbose_p,