Cleanup INLINE support for simulators using common framework.

Make IGEN responsible for co-ordinating inlining of generated files.
By default, aclocal.m4 disabled all inlining.

1 files changed, 27 insertions, 5 deletions

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index f0cd32f..eac0c7b 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -81,8 +81,7 @@ SIM_ENVIRONMENT = @sim_environment@
 SIM_FLOAT = @sim_float@
 SIM_HARDWARE = @sim_hardware@
 SIM_HW_OBJS = @sim_hw_obj@
-SIM_DV_OBJS = @sim_dv_obj@
-SIM_DV_SRC = @sim_dv_src@
+SIM_HW = @sim_hw@
 SIM_HOSTENDIAN = @sim_hostendian@
 SIM_INLINE = @sim_inline@
 SIM_PACKAGES = @sim_packages@
@@ -159,7 +158,6 @@ SIM_NEW_COMMON_OBJS = \
 	sim-watch.o \
 	\
 	$(SIM_HW_OBJS) \
-	$(SIM_DV_OBJS) \
 
 
 ## End COMMON_PRE_CONFIG_FRAG
@@ -263,6 +261,7 @@ stamp-tvals: gentmap
 
 sim_main_headers = \
 	sim-main.h \
+	$(srccom)/sim-inline.h \
 	$(srccom)/sim-config.h \
 	$(srccom)/sim-base.h \
 	$(srccom)/sim-basics.h \
@@ -295,6 +294,7 @@ sim-options_h = $(srccom)/sim-options.h
 sim-break_h = $(srccom)/sim-break.h
 sim-signal_h = $(srccom)/sim-signal.h
 
+# start-sanitize-am30
 hw-base_h = $(srccom)/hw-base.h
 hw-device_h = $(srccom)/hw-device.h
 hw-handles_h = #$(srccom)/hw-handles.h
@@ -310,7 +310,7 @@ hw_base_headers = \
 	$(hw-handles_h) \
 	$(hw-ports_h) \
 	$(hw-properties_h) \
-
+# end-sanitize-am30
 
 # FIXME: If this complicated way of building .o files from ../common is
 # necessary, the reason should be documented here.
@@ -360,6 +360,11 @@ sim-hrw.o: $(srccom)/sim-hrw.c $(sim-assert_h) $(sim_core_h) \
 	  $(SIM_EXTRA_DEPS)
 	$(CC) -c $(srccom)/sim-hrw.c $(ALL_CFLAGS)
 
+#start-sanitize-am30
+sim-hw.o: $(srccom)/sim-hw.c $(sim_main_headers) $(SIM_EXTRA_DEPS)
+	$(CC) -c $(srccom)/sim-hw.c $(ALL_CFLAGS)
+
+#end-sanitize-am30
 sim-info.o: $(srccom)/sim-info.c $(sim-assert_h) \
 	  $(srcroot)/include/remote-sim.h \
 	  $(SIM_EXTRA_DEPS)
@@ -430,8 +435,24 @@ sim-break.o: $(srccom)/sim-break.c $(sim_main_headers) \
 	$(CC) -c $(srccom)/sim-break.c $(ALL_CFLAGS)
 
 
+# start-sanitize-am30
+# FIXME This is one very simple-minded way of generating the file hw-config.h
+hw-config.h: Makefile.in $(srccom)/Make-common.in config.status Makefile
+	rm -f tmp-hw.h
+	echo "/* generated by Makefile */" > tmp-hw.h
+	for hw in $(SIM_HW) ; do \
+	  echo "extern const struct hw_device_descriptor dv_$${hw}_descriptor[];" ; \
+	done >> tmp-hw.h
+	echo "const struct hw_device_descriptor *hw_descriptors[] = {" >> tmp-hw.h
+	for hw in $(SIM_HW) ; do \
+	  echo "  dv_$${hw}_descriptor," ; \
+	done >> tmp-hw.h
+	echo "  NULL," >> tmp-hw.h
+	echo "};" >> tmp-hw.h
+	mv tmp-hw.h hw-config.h
+
 hw-base.o: $(srccom)/hw-base.c $(sim_main_headers) \
-	  $(hw_base_headers)
+	  $(hw_base_headers) hw-config.h
 	$(CC) -c $(srccom)/hw-base.c $(ALL_CFLAGS)
 
 hw-device.o: $(srccom)/hw-device.c $(sim_main_headers) \
@@ -471,6 +492,7 @@ dv-pal.o: $(srccom)/dv-pal.c $(sim_main_headers) \
 	  $(sim-main_h) $(hw_base_headers)
 	$(CC) -c $(srccom)/dv-pal.c $(ALL_CFLAGS)
 
+#end-sanitize-am30
 
 nrun.o: $(srccom)/nrun.c config.h tconfig.h \
 	  $(srcroot)/include/remote-sim.h $(srcroot)/include/callback.h \