* Makefile.in (sim-options_h): Define.

	(sim-{module,options,trace,profile,utils}.o): Clean up dependencies.
	(sim-model.o): Add new rule.
	(cgen-{scache,trace,utils}.o): Add new rules.
	* aclocal.m4 (SIM_AC_OPTION_{SCACHE,DEFAULT_MODEL}): Add.
	* cgen-scache.c (scache_print_profile): Change `sd' arg to `cpu'.
	Indent output by 2 spaces.
	* cgen-scache.h (scache_print_profile): Update.
	* cgen-trace.c (trace_insn_fini): Indent output by 2 spaces.
	Use trace_printf, not fprintf.
	(trace_extract): Use trace_printf, not cgen_trace_printf.
	* genmloop.sh (!FAST case): Increment `insn_count'.
	* sim-base.h (sim_state_base): Only include scache_size if WITH_SCACHE.
	(sim_cpu_base): Rename member `sd' to `state' to be consistent with
	access macro's name.
	* sim-core.c (sim_core_init): Use EXTERN_SIM_CORE to define it.
	Change return type to SIM_RC.
	(sim_core_{install,uninstall}): New functions.
	* sim-core.h (sim_core_{install,uninstall}): Declare.
	(sim_core_init): Use EXTERN_SIM_CORE to define it.
	Change return type to SIM_RC.
	* sim-model.h (models,machs,model_install): Declare.
	* sim-module.c (modules): Add scache_install, model_install.
	(sim_post_argv_init): Set cpu->state backlinks.
	* sim-options.c (standard_options): Delete --simcache-size,--max-insns.
	(standard_option_handler): Likewise.
	* sim-profile.c (PROFILE_{HISTOGRAM,LABEL}_WIDTH): Move to
	sim-profile.h.
	(*): Assume ANSI C.
	(profile_options): Delete --profile-simcache.
	(profile_option_handler): Likewise.
	(profile_print_insn): Change `sd' arg to `cpu'.  Indent output 2
	spaces.
	(profile_print_{memory,model}): Likewise.
	(profile_print_simcache): Delete.
	(profile_print_speed): New function.
	(profile_print): Rewrite.
	* sim-profile.h (PROFILE_scache): Renamed from PROFILE_simcache.
	(WITH_PROFILE_SCACHE_P): Renamed from WITH_PROFILE_SIMCACHE_P.
	(PROFILE_DATA): Delete members simcache_{hits,misses}.
	(PROFILE_COUNT_SIMCACHE_{HIT,MISS}): Delete.
	(PROFILE_{CALLBACK,CPU_CALLBACK}): New types.
	(profile_print): Update prototype.

1 files changed, 29 insertions, 9 deletions

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 1f3255a..497d6ad 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -71,7 +71,6 @@ SIM_DEBUG = @sim_debug@
 SIM_TRACE = @sim_trace@
 SIM_PROFILE = @sim_profile@
 
-
 HDEFINES = @HDEFINES@
 TDEFINES =
 
@@ -177,8 +176,8 @@ sim_main_headers = \
 	$(srcdir)/../common/sim-config.h \
 	$(srcdir)/../common/sim-base.h \
 	$(srcdir)/../common/sim-basics.h \
-	$(srcdir)/../common/sim-module.h \
 	$(srcdir)/../common/sim-model.h \
+	$(srcdir)/../common/sim-module.h \
 	$(srcdir)/../common/sim-trace.h \
 	$(srcdir)/../common/sim-profile.h \
 	tconfig.h
@@ -193,10 +192,10 @@ sim-core_h = $(srcdir)/../common/sim-core.h
 sim-n-core_h = $(srcdir)/../common/sim-n-core.h
 sim-events_h = $(srcdir)/../common/sim-events.h
 sim-io_h = $(srcdir)/../common/sim-io.h
-sim-n-io_h = $(srcdir)/../common/sim-n-io.h
+sim-options_h = $(srcdir)/../common/sim-options.h
 
 # FIXME: If this complicated way of building .o files from ../common is
-# necessary, the reason should be documented here!
+# necessary, the reason should be documented here.
 
 BUILT_SRC_FROM_COMMON= \
 	sim-endian.c \
@@ -262,23 +261,27 @@ sim-io.c: $(srcdir)/../common/sim-io.c
 	$(srcdir)/../../move-if-change tmp-$@ $@
 
 sim-module.o: $(srcdir)/../common/sim-module.c $(sim_main_headers) \
-	  $(srcdir)/../common/sim-io.h
+	  $(sim-io_h) $(SIM_EXTRA_DEPS)
 	$(CC) -c $(srcdir)/../common/sim-module.c $(ALL_CFLAGS)
 
 sim-options.o: $(srcdir)/../common/sim-options.c $(sim_main_headers) \
-	  $(srcdir)/../common/sim-options.h
+	  $(sim-options_h) $(sim-io_h) $(SIM_EXTRA_DEPS)
 	$(CC) -c $(srcdir)/../common/sim-options.c $(ALL_CFLAGS)
 
 sim-trace.o: $(srcdir)/../common/sim-trace.c $(sim_main_headers) \
-	  $(srcdir)/../common/sim-io.h
+	  $(sim-options_h) $(sim-io_h) $(SIM_EXTRA_DEPS)
 	$(CC) -c $(srcdir)/../common/sim-trace.c $(ALL_CFLAGS)
 
 sim-profile.o: $(srcdir)/../common/sim-profile.c $(sim_main_headers) \
-	  $(srcdir)/../common/sim-io.h
+	  $(sim-options_h) $(sim-io_h) $(SIM_EXTRA_DEPS)
 	$(CC) -c $(srcdir)/../common/sim-profile.c $(ALL_CFLAGS)
 
+sim-model.o: $(srcdir)/../common/sim-model.c $(sim_main_headers) \
+	  $(sim-io_h) $(SIM_EXTRA_DEPS)
+	$(CC) -c $(srcdir)/../common/sim-model.c $(ALL_CFLAGS)
+
 sim-utils.o: $(srcdir)/../common/sim-utils.c $(sim_main_headers) \
-	$(SIM_EXTRA_DEPS)
+	  $(SIM_EXTRA_DEPS)
 	$(CC) -c $(srcdir)/../common/sim-utils.c $(ALL_CFLAGS)
 
 sim-load.o: $(srcdir)/../common/sim-load.c
@@ -288,6 +291,23 @@ nrun.o: $(srcdir)/../common/nrun.c config.h tconfig.h \
 	  $(srcroot)/include/callback.h $(sim_main_headers)
 	$(CC) -c $(srcdir)/../common/nrun.c $(ALL_CFLAGS)
 
+# CGEN support.
+
+cgen-scache.o: $(srcdir)/../common/cgen-scache.c $(sim_main_headers) \
+	  $(SIM_EXTRA_DEPS) $(srcdir)/../common/cgen-scache.h
+	$(CC) -c $(srcdir)/../common/cgen-scache.c $(ALL_CFLAGS)
+
+cgen-trace.o: $(srcdir)/../common/cgen-trace.c $(sim_main_headers) \
+	  $(SIM_EXTRA_DEPS) $(srcdir)/../common/cgen-trace.h
+	$(CC) -c $(srcdir)/../common/cgen-trace.c $(ALL_CFLAGS)
+
+cgen-utils.o: $(srcdir)/../common/cgen-utils.c $(sim_main_headers) \
+	  $(SIM_EXTRA_DEPS) $(srcdir)/../common/cgen-mem.h \
+	  $(srcdir)/../common/cgen-sem.h
+	$(CC) -c $(srcdir)/../common/cgen-utils.c $(ALL_CFLAGS)
+
+# Support targets.
+
 install: install-common $(SIM_EXTRA_INSTALL)
 
 install-common: installdirs