Latest cagney update

1 files changed, 41 insertions, 30 deletions

diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index d7243713cf9..e5684bbdda2 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -83,8 +83,7 @@ TRACE_CFLAGS = @sim_trace@
 ASSERT_CFLAGS = @sim_assert@
 RESERVED_CFLAGS = @sim_reserved@
 MONITOR_CFLAGS = @sim_monitor@
-FUNC_CFLAGS = @sim_func@
-MODEL_CFLAGS = @sim_model@ @sim_default_model@
+MODEL_CFLAGS = @sim_model@ @sim_default_model@ @sim_model_issue@
 WARNING_CFLAGS = @sim_warnings@
 CONFIG_CFLAGS = $(BSWAP_CFLAGS) \
   $(ENDIAN_CFLAGS) \
@@ -101,7 +100,6 @@ CONFIG_CFLAGS = $(BSWAP_CFLAGS) \
   $(ASSERT_CFLAGS) \
   $(RESERVED_CFLAGS) \
   $(MONITOR_CFLAGS) \
-  $(FUNC_CFLAGS) \
   $(MODEL_CFLAGS)
 
 STD_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)
@@ -139,14 +137,15 @@ all:	run $(TARGETLIB) $(GDB_OBJ)
 
 
 BASICS_H = \
+	basics.h \
 	config.h \
 	ppc-config.h \
+	inline.h \
+	sim_callbacks.h \
+	debug.h filter_filename.h \
 	words.h \
-	sim-endian.h \
-	debug.h \
-	filter_filename.h \
 	bits.h \
-	sim_callbacks.h
+	sim-endian.h
 
 PSIM_H = \
 	psim.h \
@@ -167,7 +166,7 @@ CPU_H = \
 	cpu.h \
 	$(BASICS_H) \
 	$(REGISTERS_H) \
-	device_tree.h \
+	device.h \
 	corefile.h \
 	vm.h \
 	events.h \
@@ -176,9 +175,13 @@ CPU_H = \
 	icache.h \
 	itable.h \
 	mon.h \
-	function_unit.h \
 	model.h
 
+DEVICE_TABLE_H = \
+	$(BASICS_H) \
+	device_table.h \
+	device.h
+
 EMUL_GENERIC_H = \
 	$(CPU_H) \
 	$(IDECODE_H) \
@@ -213,16 +216,18 @@ LIB_SRC = \
 	vm.c \
 	vm_n.h \
 	corefile.c \
-	function_unit.c \
 	events.c \
 	os_emul.c \
 	emul_generic.c \
 	emul_netbsd.c \
+	emul_chirp.c \
+	emul_bugapi.c \
 	registers.c \
 	cpu.c \
 	interrupts.c \
-	devices.c \
-	device_tree.c \
+	device.c \
+	device_table.c \
+	cap.c \
 	mon.c \
 	options.c
 
@@ -235,29 +240,31 @@ MAIN_SRC = \
 #       first
 LIB_OBJ = \
 	debug.o \
-	options.o \
 	filter_filename.o \
 	bits.o \
 	sim-endian.o \
 	os_emul.o \
 	emul_generic.o \
 	emul_netbsd.o \
+	emul_chirp.o \
+	emul_bugapi.o \
 	registers.o \
 	vm.o \
 	corefile.o \
 	model.o \
-	function_unit.o \
 	spreg.o \
 	cpu.o \
 	interrupts.o \
 	events.o \
-	devices.o \
-	device_tree.o \
+	cap.o \
+	device.o \
+	device_table.o \
 	itable.o \
 	mon.o \
 	semantics.o \
 	idecode.o \
-	psim.o
+	psim.o \
+	options.o
 
 
 GDB_OBJ = sim_calls.o 
@@ -278,7 +285,6 @@ $(TARGETLIB): tmp-igen tmp-dgen $(LIB_OBJ) $(GDB_OBJ)
 # 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)
-	$(CC) -c $(NOWARN_CFLAGS) $<
 
 bits.o: bits.c $(BASICS_H)
 
@@ -287,9 +293,12 @@ filter_filename.o: filter_filename.c filter_filename.h config.h ppc-config.h
 
 sim-endian.o: sim-endian.c sim-endian-n.h $(BASICS_H)
 
-os_emul.o: os_emul.c $(EMUL_GENERIC_H)
+os_emul.o: os_emul.c emul_netbsd.h emul_chirp.h emul_bugapi.h $(EMUL_GENERIC_H)
 emul_generic.o: emul_generic.c $(EMUL_GENERIC_H)
+
 emul_netbsd.o: emul_netbsd.c emul_netbsd.h $(EMUL_GENERIC_H)
+emul_chirp.o: emul_chirp.c emul_chirp.h cap.h $(EMUL_GENERIC_H)
+emul_bugapi.o: emul_bugapi.c emul_bugapi.h $(EMUL_GENERIC_H)
 
 registers.o: registers.c $(REGISTERS_H) $(BASICS_H) 
 
@@ -303,26 +312,25 @@ idecode.o: idecode.c $(CPU_H) $(IDECODE_H) semantics.h
 # double.o: double.c dp-bit.c
 
 vm.o: vm.c vm.h vm_n.h $(BASICS_H) $(REGISTERS_H) \
-	device_tree.h corefile.h interrupts.h itable.h mon.h
-
-corefile.o: corefile.c corefile.h $(BASICS_H) device_tree.h
+	device.h corefile.h interrupts.h itable.h mon.h
 
-function_unit.o: function_unit.c $(CPU_H)
+corefile.o: corefile.c corefile.h corefile-n.h $(BASICS_H) device.h
 
 model.o: model.c $(CPU_H)
 
 events.o: events.c events.h $(BASICS_H) 
 
-sim_calls.o: sim_calls.c $(CPU_H) $(PSIM_H) ../../gdb/tm.h devices.h options.h
+sim_calls.o: sim_calls.c $(PSIM_H) itable.h ../../gdb/tm.h options.h
 
-spreg.o: spreg.h spreg.c words.h
+spreg.o: spreg.h spreg.c $(BASICS_H)
 
-main.o: main.c $(PSIM_H) function_unit.h itable.h options.h
+main.o: main.c $(PSIM_H) itable.h options.h
 
-devices.o: devices.c devices.h $(CPU_H) \
-	device_tree.h events.h
+device.o: device.c $(DEVICE_TABLE_H)
 
-device_tree.o: device_tree.c device_tree.h devices.h $(BASICS_H)
+device_table.o: device_table.c $(DEVICE_TABLE_H) events.h
+
+cap.o: cap.c cap.h $(BASICS_H)
 
 semantics.o: semantics.c semantics.h $(CPU_H) $(IDECODE_H)
 	$(CC) -c $(NOWARN_CFLAGS) $<
@@ -405,9 +413,12 @@ TAGS: $(BUILT_SRC)
 clean mostlyclean:
 	rm -f tmp-* *.[oasi] core psim run igen dgen config.log $(BUILT_SRC_WO_CONFIG)
 
-distclean maintainer-clean realclean: clean
+distclean realclean: clean
 	rm -f TAGS Makefile config.cache config.status config.h stamp-h
 
+maintainer-clean: distclean
+	rm -f *~ ppc-config.h
+
 Makefile: Makefile.in config.status
 	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status