Install libsim.a $(exec_prefix)/lib/lib[target]-sim.a as part of install-sim.

2 files changed, 70 insertions, 17 deletions

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 57c01b9..2cf0683 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,4 +1,52 @@
-Wed May  6 10:08:16 1998  Doug Evans  <devans@canuck.cygnus.com>
+Fri May 15 15:03:00 1998  Joyce Janczyn  <janczyn@cygnus.com>
+
+	* Make-common.in (install-common): Rename and install libsim.a.
+
+Tue May 12 15:23:57 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* sim-io.c (unistd.h): Include.
+
+Wed May  6 16:04:18 1998  Doug Evans  <devans@seba.cygnus.com>
+
+	* Make-common (sim_main_headers): Sort.
+	(cgen-*.o): Add cgen-sim.h dependency.
+
+	* cgen-scache.c (scache_init): Only allocate space if scache element
+	size is non-zero.
+	(scache_flush,scache_print_profile): Check if scache in use first.
+
+	* cgen-sim.h (IDESC): Provide forward declaration.
+	(DECODE): Delete.
+	(CGEN_CPU): Always define scache member.  New members idesc,opcode.
+	(cgen_cpu_max_extra_bytes): Declare.
+	* cgen-utils.c (cgen_cpu_max_extra_bytes): New function.
+
+	* cgen.sh: s/@arch@/${arch}/ for cpu files.
+
+	* sim-cpu.h: New file.  sim_cpu_base moved here.
+	Move sim_cpu_lookup decl here.
+	* sim-base.h: #include "sim-cpu.h".
+	* sim-cpu.c: New file.
+	* Make-common (sim_main_headers): Add sim-cpu.h.
+	(sim-cpu.o): Add rule for.
+
+	* sim-model.c (set_model): Delete.
+	(sim_model_set,model_set): New functions.
+	(sim_model_install): Renamed from model_install.
+	Don't set default model here.
+	(model_option_handler): Rewrite --model processing.
+	(sim_model_lookup,sim_mach_lookup): New functions.
+	* sim-model.h (MAX_MODELS,MAX_INSNS): Delete.
+	(insn_timing): Delete.
+	(INSN_TIMING): New member `num'.
+	(IMP_PROPERTIES): Always define scache_elm_size member.
+	(MACH): New member init_cpu.
+	(sim_machs): Renamed from machs.
+	(sim_model_install): Renamed from model_install.
+	(sim_model_set,sim_model_lookup,sim_mach_lookup): Declare.
+	* sim-module.c (modules): Update.
+
+	* sim-profile.c (profile_print_insn): Add cpu arg to INSN_NAME macro.
 
 	* sim-io.c: #include <errno.h>.
 
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index d217e6e..0c648ac 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -60,6 +60,7 @@ includedir = @includedir@
 # This can be referenced by the gettext configuration code.
 top_builddir = ..
 
+EXEEXT = @EXEEXT@
 SHELL = @SHELL@
 
 INSTALL = @INSTALL@
@@ -228,7 +229,7 @@ libsim.a: $(LIB_OBJS)
 	$(RANLIB) libsim.a
 
 run: $(SIM_RUN_OBJS) libsim.a $(LIBDEPS)
-	$(CC) $(ALL_CFLAGS) -o run \
+	$(CC) $(ALL_CFLAGS) -o run$(EXEEXT) \
 	  $(SIM_RUN_OBJS) libsim.a $(EXTRA_LIBS)
 
 run.o: $(srccom)/run.c config.h tconfig.h \
@@ -269,20 +270,21 @@ stamp-tvals: gentmap
 
 sim_main_headers = \
 	sim-main.h \
-	$(srccom)/sim-inline.h \
-	$(srccom)/sim-config.h \
+	$(srccom)/sim-assert.h \
 	$(srccom)/sim-base.h \
 	$(srccom)/sim-basics.h \
-	$(srccom)/sim-signal.h \
+	$(srccom)/sim-config.h \
+	$(srccom)/sim-cpu.h \
+	$(srccom)/sim-engine.h \
+	$(srccom)/sim-events.h \
+	$(srccom)/sim-inline.h \
 	$(srccom)/sim-memopt.h \
 	$(srccom)/sim-model.h \
 	$(srccom)/sim-module.h \
-	$(srccom)/sim-trace.h \
 	$(srccom)/sim-profile.h \
-	$(srccom)/sim-engine.h \
-	$(srccom)/sim-events.h \
+	$(srccom)/sim-signal.h \
+	$(srccom)/sim-trace.h \
 	$(srccom)/sim-watch.h \
-	$(srccom)/sim-assert.h \
 	tconfig.h \
 	$(SIM_EXTRA_DEPS)
 
@@ -343,6 +345,10 @@ sim-core.o: $(srccom)/sim-core.c $(sim_main_headers) \
 	  $(SIM_EXTRA_DEPS)
 	$(CC) -c $(srccom)/sim-core.c $(ALL_CFLAGS)
 
+sim-cpu.o: $(srccom)/sim-cpu.c $(sim_main_headers) \
+	  $(SIM_EXTRA_DEPS)
+	$(CC) -c $(srccom)/sim-cpu.c $(ALL_CFLAGS)
+
 sim-endian.o: $(srccom)/sim-endian.c $(sim-endian_h) $(sim-n-endian_h) \
 	  $(SIM_EXTRA_DEPS)
 	$(CC) -c $(srccom)/sim-endian.c $(ALL_CFLAGS)
@@ -514,19 +520,16 @@ dv-sockser.o: $(srccom)/dv-sockser.h $(sim_main_headers)
 
 # CGEN support.
 
-cgen-run.o: $(srccom)/cgen-run.c $(sim_main_headers) \
-	  $(srccom)/cgen-mem.h $(srccom)/cgen-ops.h
-	$(CC) -c $(srccom)/cgen-run.c $(ALL_CFLAGS)
-
-cgen-scache.o: $(srccom)/cgen-scache.c $(sim_main_headers)
+cgen-scache.o: $(srccom)/cgen-scache.c $(sim_main_headers) \
+	  $(srccom)/cgen-sim.h
 	$(CC) -c $(srccom)/cgen-scache.c $(ALL_CFLAGS)
 
 cgen-trace.o: $(srccom)/cgen-trace.c $(sim_main_headers) \
-	  $(srccom)/cgen-trace.h
+	  $(srccom)/cgen-sim.h $(srccom)/cgen-trace.h
 	$(CC) -c $(srccom)/cgen-trace.c $(ALL_CFLAGS)
 
 cgen-utils.o: $(srccom)/cgen-utils.c $(sim_main_headers) \
-	  $(srccom)/cgen-mem.h $(srccom)/cgen-ops.h
+	  $(srccom)/cgen-sim.h $(srccom)/cgen-mem.h $(srccom)/cgen-ops.h
 	$(CC) -c $(srccom)/cgen-utils.c $(ALL_CFLAGS)
 
 # Support targets.
@@ -535,7 +538,9 @@ install: install-common $(SIM_EXTRA_INSTALL)
 
 install-common: installdirs
 	n=`echo run | sed '$(program_transform_name)'`; \
-	$(INSTALL_PROGRAM) run $(bindir)/$$n
+	$(INSTALL_PROGRAM) run$(EXEEXT) $(bindir)/$$n
+	n=`echo libsim.a | sed s/libsim.a/lib$(target_alias)-sim.a/`; \
+	$(INSTALL_DATA) libsim.a $(libdir)/$$n
 
 installdirs:
 	$(SHELL) $(srcdir)/../../mkinstalldirs $(bindir)