From 523ba8f92e3ff4c49f65b582c89b4563b1b665ad Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 22 Mar 2015 23:16:01 -0400 Subject: [PATCH] sim: erc32/h8300/m68hc11: trim unused functions These funcs are only used with the old run.o, and these sims use nrun.o, so drop these stub funcs. --- sim/common/ChangeLog | 4 ++++ sim/common/tconfig.h | 3 ++- sim/erc32/ChangeLog | 4 ++++ sim/erc32/interf.c | 22 ---------------------- sim/h8300/ChangeLog | 5 +++++ sim/h8300/compile.c | 23 ----------------------- sim/h8300/tconfig.h | 6 ------ sim/m68hc11/ChangeLog | 6 ++++++ sim/m68hc11/interp.c | 31 ------------------------------- sim/m68hc11/sim-main.h | 2 -- 10 files changed, 21 insertions(+), 85 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index c474abebb8..85cf559afb 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,7 @@ +2015-03-24 Mike Frysinger + + * tconfig.h: Note SIM_HAVE_PROFILE is deprecated. + 2015-03-24 Mike Frysinger * tconfig.h: Note SIM_HAVE_BIENDIAN is deprecated. diff --git a/sim/common/tconfig.h b/sim/common/tconfig.h index 4df076ee0c..9cf9687abb 100644 --- a/sim/common/tconfig.h +++ b/sim/common/tconfig.h @@ -5,7 +5,8 @@ /* Define this if the simulator supports profiling. See the mips simulator for an example. This enables the `-p foo' and `-s bar' options. - The target is required to provide sim_set_profile{,_size}. */ + The target is required to provide sim_set_profile{,_size}. + TODO: This is specific to the old run.o main. */ /* #define SIM_HAVE_PROFILE */ /* Define this if the simulator uses an instruction cache. diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index 3c4daa3c23..a1e6ed72d1 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,7 @@ +2015-03-24 Mike Frysinger + + * interf.c (sim_set_callbacks, sim_size, sim_trace): Delete. + 2015-03-17 Jiri Gaisler * func.c (exec_cmd): Silence compiler warnings when calling system(). diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c index 608b224f74..7d64ed6fa3 100644 --- a/sim/erc32/interf.c +++ b/sim/erc32/interf.c @@ -162,19 +162,6 @@ run_sim(sregs, icount, dis) return (TIME_OUT); } -void -sim_set_callbacks (ptr) - host_callback *ptr; -{ - sim_callback = ptr; -} - -void -sim_size (memsize) - int memsize; -{ -} - SIM_DESC sim_open (kind, callback, abfd, argv) SIM_OPEN_KIND kind; @@ -468,15 +455,6 @@ sim_resume(SIM_DESC sd, int step, int siggnal) if (sis_gdb_break) flush_windows (); } -int -sim_trace (sd) - SIM_DESC sd; -{ - /* FIXME: unfinished */ - sim_resume (sd, 0, 0); - return 1; -} - void sim_do_command(sd, cmd) SIM_DESC sd; diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog index 0ef2344d16..7fff0bd611 100644 --- a/sim/h8300/ChangeLog +++ b/sim/h8300/ChangeLog @@ -1,3 +1,8 @@ +2015-03-24 Mike Frysinger + + * compile.c (sim_set_callbacks, sim_size, sim_trace): Delete. + * tconfig.h (SIM_HAVE_PROFILE): Delete. + 2015-03-16 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/h8300/compile.c b/sim/h8300/compile.c index 4deba8281f..2574168e33 100644 --- a/sim/h8300/compile.c +++ b/sim/h8300/compile.c @@ -4594,15 +4594,6 @@ sim_resume (SIM_DESC sd, int step, int siggnal) h8_set_mask (sd, oldmask); } -int -sim_trace (SIM_DESC sd) -{ - /* FIXME: Unfinished. */ - (*sim_callback->printf_filtered) (sim_callback, - "sim_trace: trace not supported.\n"); - return 1; /* Done. */ -} - int sim_write (SIM_DESC sd, SIM_ADDR addr, const unsigned char *buffer, int size) { @@ -4790,14 +4781,6 @@ sim_stop_reason (SIM_DESC sd, enum sim_stop *reason, int *sigrc) sim_engine_get_run_state (sd, reason, sigrc); } -/* FIXME: Rename to sim_set_mem_size. */ - -void -sim_size (int n) -{ - /* Memory size is fixed. */ -} - static void set_simcache_size (SIM_DESC sd, int n) { @@ -5094,9 +5077,3 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd, char **argv, char **env) return SIM_RC_OK; } - -void -sim_set_callbacks (struct host_callback_struct *ptr) -{ - sim_callback = ptr; -} diff --git a/sim/h8300/tconfig.h b/sim/h8300/tconfig.h index d9599dbcd7..5a683f0915 100644 --- a/sim/h8300/tconfig.h +++ b/sim/h8300/tconfig.h @@ -1,11 +1,5 @@ /* h8300 target configuration file. */ -/* Define this if the simulator supports profiling. - See the mips simulator for an example. - This enables the `-p foo' and `-s bar' options. - The target is required to provide sim_set_profile{,_size}. */ -/* #define SIM_HAVE_PROFILE */ - /* Define this if the simulator uses an instruction cache. See the h8/300 simulator for an example. This enables the `-c size' option to set the size of the cache. diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index fc18f38e45..e311bc96bf 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,9 @@ +2015-03-24 Mike Frysinger + + * compile.c (sim_set_profile, sim_set_profile_size, sim_set_callbacks, + sim_size, sim_trace): Delete. + * sim-main.h (sim_set_profile, sim_set_profile_size): Delete. + 2015-03-24 Mike Frysinger * configure: Regenerate. diff --git a/sim/m68hc11/interp.c b/sim/m68hc11/interp.c index b787eb1e1b..77aebcb230 100644 --- a/sim/m68hc11/interp.c +++ b/sim/m68hc11/interp.c @@ -502,16 +502,6 @@ sim_close (SIM_DESC sd, int quitting) return; } -void -sim_set_profile (int n) -{ -} - -void -sim_set_profile_size (int n) -{ -} - /* Generic implementation of sim_engine_run that works within the sim_engine setjmp/longjmp framework. */ @@ -537,13 +527,6 @@ sim_engine_run (SIM_DESC sd, } } -int -sim_trace (SIM_DESC sd) -{ - sim_resume (sd, 0, 0); - return 1; -} - void sim_info (SIM_DESC sd, int verbose) { @@ -573,14 +556,6 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd, return sim_prepare_for_program (sd, abfd); } - -void -sim_set_callbacks (host_callback *p) -{ - /* m6811_callback = p; */ -} - - int sim_fetch_register (SIM_DESC sd, int rn, unsigned char *memory, int length) { @@ -704,12 +679,6 @@ sim_store_register (SIM_DESC sd, int rn, unsigned char *memory, int length) return 2; } -void -sim_size (int s) -{ - ; -} - /* Halt the simulator after just one instruction */ static void diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h index f686ed7dec..5dfc1bfdf5 100644 --- a/sim/m68hc11/sim-main.h +++ b/sim/m68hc11/sim-main.h @@ -587,8 +587,6 @@ struct sim_state { sim_state_base base; }; -extern void sim_set_profile (int n); -extern void sim_set_profile_size (int n); extern void sim_board_reset (SIM_DESC sd); #define PRINT_TIME 0x01 -- 2.34.1