January 23rd merge

1 files changed, 43 insertions, 33 deletions

diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 1d36f65..b14084e 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -196,12 +196,14 @@ DEVICE_TABLE_H = \
 	$(BASICS_H) \
 	device_table.h \
 	device.h \
+	tree.h \
 	hw.h
 
 EMUL_GENERIC_H = \
 	$(CPU_H) \
 	$(IDECODE_H) \
 	emul_generic.h \
+	tree.h \
 	os_emul.h
 
 
@@ -227,7 +229,7 @@ BUILT_SRC = \
 	config.h \
 	ppc-config.h 
 
-LIB_SRC = \
+LIB_INLINE_SRC = \
 	psim.c \
 	bits.c \
 	debug.c \
@@ -239,21 +241,20 @@ LIB_SRC = \
 	corefile.c \
 	events.c \
 	os_emul.c \
-	emul_generic.c \
-	emul_netbsd.c \
-	emul_unix.c \
-	emul_chirp.c \
-	emul_bugapi.c \
 	registers.c \
 	cpu.c \
 	interrupts.c \
 	device.c \
+	tree.c \
 	device_table.c \
 	cap.c \
 	mon.c \
-	options.c \
+	options.c
+
+LIB_SRC = \
 	$(PACKAGE_SRC) \
-	$(HW_SRC)
+	$(HW_SRC) \
+	$(LIB_INLINE_SRC)
 
 MAIN_SRC = \
 	main.c \
@@ -269,10 +270,10 @@ LIB_OBJ = \
 	sim-endian.o \
 	os_emul.o \
 	emul_generic.o \
+	emul_bugapi.o \
+	emul_chirp.o \
 	emul_netbsd.o \
 	emul_unix.o \
-	emul_chirp.o \
-	emul_bugapi.o \
 	registers.o \
 	vm.o \
 	corefile.o \
@@ -283,6 +284,7 @@ LIB_OBJ = \
 	events.o \
 	cap.o \
 	device.o \
+	tree.o \
 	device_table.o \
 	itable.o \
 	mon.o \
@@ -291,9 +293,9 @@ LIB_OBJ = \
 	idecode.o \
 	support.o \
 	psim.o \
-	options.o \
 	$(PACKAGE_OBJ) \
-	$(HW_OBJ)
+	$(HW_OBJ) \
+	options.o
 
 
 GDB_OBJ = sim_calls.o 
@@ -317,9 +319,7 @@ $(TARGETLIB): tmp-igen tmp-dgen tmp-hw tmp-pk $(LIB_OBJ) $(GDB_OBJ)
 	$(AR) $(AR_FLAGS) $(TARGETLIB) $(LIB_OBJ) $(GDB_OBJ)
 	$(RANLIB) $(TARGETLIB)
 
-# Given that inlines are turned on now, rebuild psim whenever
-# anything changes.
-psim.o: psim.c psim.h $(CPU_H) $(IDECODE_H) $(INLINE) $(LIB_SRC) $(BUILT_SRC)
+psim.o: psim.c psim.h tree.h $(CPU_H) $(IDECODE_H)
 
 bits.o: bits.c $(BASICS_H)
 
@@ -331,10 +331,10 @@ sim-endian.o: sim-endian.c sim-endian-n.h $(BASICS_H)
 os_emul.o: os_emul.c emul_netbsd.h emul_unix.h emul_chirp.h emul_bugapi.h $(EMUL_GENERIC_H)
 emul_generic.o: emul_generic.c $(EMUL_GENERIC_H)
 
+emul_bugapi.o: emul_bugapi.c emul_bugapi.h $(EMUL_GENERIC_H)
+emul_chirp.o: emul_chirp.c emul_chirp.h $(EMUL_GENERIC_H)
 emul_netbsd.o: emul_netbsd.c emul_netbsd.h $(EMUL_GENERIC_H)
 emul_unix.o: emul_unix.c emul_unix.h $(EMUL_GENERIC_H)
-emul_chirp.o: emul_chirp.c emul_chirp.h $(EMUL_GENERIC_H)
-emul_bugapi.o: emul_bugapi.c emul_bugapi.h $(EMUL_GENERIC_H)
 
 registers.o: registers.c $(REGISTERS_H) $(BASICS_H) 
 
@@ -342,13 +342,14 @@ cpu.o: cpu.c $(CPU_H) $(IDECODE_H)
 
 interrupts.o: interrupts.c $(CPU_H) $(IDECODE_H) os_emul.h
 
-idecode.o: idecode.c $(CPU_H) $(IDECODE_H) semantics.h
+# Given that inlines are turned on now, rebuild idecode whenever
+# anything changes.
+idecode.o: idecode.c $(CPU_H) $(IDECODE_H) semantics.h $(LIB_INLINE_SRC) $(BUILT_SRC)
 	$(CC) -c $(NOWARN_CFLAGS) $<
 
 # double.o: double.c dp-bit.c
 
-vm.o: vm.c vm.h vm_n.h $(BASICS_H) $(REGISTERS_H) \
-	device.h corefile.h interrupts.h itable.h mon.h
+vm.o: vm.c vm.h vm_n.h $(CPU_H)
 
 corefile.o: corefile.c corefile.h corefile-n.h $(BASICS_H) $(DEVICE_TABLE_H)
 
@@ -364,6 +365,8 @@ main.o: main.c $(PSIM_H) itable.h options.h
 
 device.o: device.c $(DEVICE_TABLE_H) cap.h
 
+tree.o: tree.c tree.h device.h $(DEVICE_TABLE_H)
+
 device_table.o: device_table.c $(DEVICE_TABLE_H) events.h hw.c
 
 cap.o: cap.c cap.h $(BASICS_H)
@@ -381,9 +384,12 @@ itable.o: itable.c itable.h
 mon.o: mon.c $(CPU_H)
 
 # Rebuild options whenever something changes so the date/time is up to date.
-options.o: options.c $(BASICS_H) $(CPU_H) $(IDECODE_H) $(INLINE) $(LIB_SRC) $(BUILT_SRC) config.status Makefile
+options.o: options.c $(BASICS_H) $(CPU_H) $(IDECODE_H) $(INLINE) $(LIB_SRC) $(BUILT_SRC) config.status Makefile defines.h
 	$(CC) -c $(STD_CFLAGS) '-DOPCODE_RULES="@sim_opcode@"' '-DIGEN_FLAGS="$(IGEN_FLAGS)"' '-DDGEN_FLAGS="$(DGEN_FLAGS)"' $<
 
+defines.h: config.h Makefile
+	rm -f defines.h
+	sed -n -e '/^#define HAVE_/s/ 1$$/",/' -e '/^#define HAVE_/s//"HAVE_/p' < config.h > defines.h
 #
 # Rules to create the built c source code files
 #
@@ -510,13 +516,13 @@ misc.o: misc.c misc.h filter_filename.h
 # real hardware
 tmp-hw: Makefile $(HW_SRC) $(srcdir)/../../move-if-change
 	for hw in $(HW_SRC) ; do echo $$hw ; done \
-	| sort -u \
+	| cat -n | sort +1 -u | sort -n \
 	| sed -e 's/^.*\(hw_.*\)\.c/\1/' \
 		-e 's/^/extern const device_descriptor /' \
 		-e 's/$$/_device_descriptor\[\];/' \
 		> tmp-hw.h
 	for hw in $(HW_SRC) ; do echo $$hw ; done \
-	| sort -u \
+	| cat -n | sort +1 -u | sort -n \
 	| sed -e 's/^.*\(hw_.*\)\.c/\1/' \
 		-e 's/^/    /' \
 		-e 's/$$/_device_descriptor,/' \
@@ -526,17 +532,21 @@ tmp-hw: Makefile $(HW_SRC) $(srcdir)/../../move-if-change
 	touch tmp-hw
 
 hw_cpu.o: hw_cpu.c $(DEVICE_TABLE_H)
+hw_core.o: hw_core.c $(DEVICE_TABLE_H)
+hw_disk.o: hw_disk.c $(DEVICE_TABLE_H) pk.h
+hw_glue.o: hw_glue.c $(DEVICE_TABLE_H)
+hw_htab.o: hw_htab.c $(DEVICE_TABLE_H)
+hw_ide.o: hw_ide.c $(DEVICE_TABLE_H)
+hw_init.o: hw_init.c $(DEVICE_TABLE_H)
+hw_iobus.o: hw_iobus.c $(DEVICE_TABLE_H)
 hw_memory.o: hw_memory.c $(DEVICE_TABLE_H)
 hw_nvram.o: hw_nvram.c $(DEVICE_TABLE_H)
-hw_iobus.o: hw_iobus.c $(DEVICE_TABLE_H)
-hw_core.o: hw_core.c $(DEVICE_TABLE_H)
+hw_opic.o: hw_opic.c $(DEVICE_TABLE_H)
 hw_pal.o: hw_pal.c $(DEVICE_TABLE_H)
-hw_htab.o: hw_htab.c $(DEVICE_TABLE_H)
-hw_disk.o: hw_disk.c $(DEVICE_TABLE_H) pk.h
-hw_trace.o: hw_trace.c $(DEVICE_TABLE_H)
+hw_phb.o: hw_phb.c $(DEVICE_TABLE_H) hw_phb.h
 hw_register.o: hw_register.c $(DEVICE_TABLE_H)
+hw_trace.o: hw_trace.c $(DEVICE_TABLE_H)
 hw_vm.o: hw_vm.c $(DEVICE_TABLE_H)
-hw_init.o: hw_init.c $(DEVICE_TABLE_H)
 # ignore this line, it stops make from getting confused
 
 
@@ -544,8 +554,8 @@ hw_init.o: hw_init.c $(DEVICE_TABLE_H)
 # real packages
 tmp-pk: Makefile $(PACKAGE_SRC) $(srcdir)/../../move-if-change
 	for pk in $(PACKAGE_SRC) ; do echo $$pk ; done \
-	| sort -u \
-	| sed -e 's/^pk_\(.*\)\.c/\1/' \
+	| cat -n | sort +1 -u | sort -n \
+	| sed -e 's/^.*pk_\(.*\)\.c/\1/' \
 		-e 's/^/extern package_create_instance_callback pk_/' \
 		-e 's/$$/_create_instance;/' \
 		> tmp-pk.h
@@ -563,10 +573,10 @@ TAGS: $(BUILT_SRC)
 	etags $(srcdir)/*.h $(srcdir)/*.c $(BUILT_SRC)
 
 clean mostlyclean:
-	rm -f tmp-* *.[oasi] core psim run igen dgen config.log $(BUILT_SRC_WO_CONFIG)
+	rm -f tmp-* *.[oasi] core psim run igen dgen $(BUILT_SRC_WO_CONFIG)
 
 distclean realclean: clean
-	rm -f TAGS Makefile config.cache config.status config.h stamp-h
+	rm -f TAGS Makefile config.cache config.status config.h defines.h stamp-h config.log
 
 maintainer-clean: distclean
 	rm -f *~ *.log ppc-config.h core *.core