--- trunk/src/cpus/Makefile.skel	2007/10/08 16:19:37	22
+++ trunk/src/cpus/Makefile.skel	2007/10/08 16:22:11	40
@@ -1,13 +1,12 @@
 #
-#  $Id: Makefile.skel,v 1.17 2005/12/11 12:46:24 debug Exp $
+#  $Id: Makefile.skel,v 1.33 2007/04/19 15:18:15 debug Exp $
 #
 #  Makefile for GXemul src/cpus
 #
 
 CFLAGS=$(CWARNINGS) $(COPTIM) $(XINCLUDE) $(DINCLUDE)
 
-OBJS=cpu_mips.o cpu_mips_coproc.o bintrans.o memory_fast_v2h.o \
-	$(CPU_ARCHS) $(CPU_BACKENDS)
+OBJS=$(CPU_ARCHS) $(CPU_BACKENDS)
 TOOLS=generate_head generate_tail $(CPU_TOOLS)
 
 
@@ -22,11 +21,6 @@
 
 
 
-#  Old bintrans:
-
-bintrans.o: bintrans.c bintrans_alpha.c bintrans_i386.c
-
-
 ###############################################################################
 
 cpu_alpha.o: cpu_alpha.c cpu_alpha_instr.c cpu_dyntrans.c ../memory_rw.c \
@@ -117,58 +111,29 @@
 
 ###############################################################################
 
-cpu_hppa.o: cpu_hppa.c cpu_hppa_instr.c cpu_dyntrans.c ../memory_rw.c \
-	tmp_hppa_head.c tmp_hppa_tail.c
-
-tmp_hppa_head.c: generate_head
-	./generate_head hppa HPPA > tmp_hppa_head.c
-
-tmp_hppa_tail.c: generate_tail
-	./generate_tail hppa HPPA > tmp_hppa_tail.c
-
-
-###############################################################################
-
-cpu_i960.o: cpu_i960.c cpu_i960_instr.c cpu_dyntrans.c ../memory_rw.c \
-	tmp_i960_head.c tmp_i960_tail.c
-
-tmp_i960_head.c: generate_head
-	./generate_head i960 i960 > tmp_i960_head.c
-
-tmp_i960_tail.c: generate_tail
-	./generate_tail i960 i960 > tmp_i960_tail.c
-
-
-###############################################################################
-
-cpu_ia64.o: cpu_ia64.c cpu_ia64_instr.c cpu_dyntrans.c ../memory_rw.c \
-	tmp_ia64_head.c tmp_ia64_tail.c
+cpu_m88k.o: cpu_m88k.c cpu_m88k_instr.c cpu_dyntrans.c ../memory_rw.c \
+	tmp_m88k_head.c tmp_m88k_tail.c
 
-tmp_ia64_head.c: generate_head
-	./generate_head ia64 IA64 > tmp_ia64_head.c
+tmp_m88k_head.c: generate_head
+	./generate_head m88k M88K > tmp_m88k_head.c
 
-tmp_ia64_tail.c: generate_tail
-	./generate_tail ia64 IA64 > tmp_ia64_tail.c
+tmp_m88k_tail.c: generate_tail
+	./generate_tail m88k M88K > tmp_m88k_tail.c
 
 
 ###############################################################################
 
-cpu_m68k.o: cpu_m68k.c cpu_m68k_instr.c cpu_dyntrans.c ../memory_rw.c \
-	tmp_m68k_head.c tmp_m68k_tail.c
+cpu_mips.o: cpu_mips.c cpu_dyntrans.c memory_mips.c \
+	cpu_mips_instr.c tmp_mips_loadstore.c tmp_mips_loadstore_multi.c \
+	tmp_mips_head.c tmp_mips_tail.c
 
-tmp_m68k_head.c: generate_head
-	./generate_head m68k M68K > tmp_m68k_head.c
-
-tmp_m68k_tail.c: generate_tail
-	./generate_tail m68k M68K > tmp_m68k_tail.c
-
-
-###############################################################################
+memory_mips.c: ../memory_rw.c memory_mips_v2p.c
 
-cpu_mips.o: cpu_mips.c cpu_mips16.c cpu_dyntrans.c memory_mips.c \
-	cpu_mips_instr.c tmp_mips_head.c tmp_mips_tail.c
+tmp_mips_loadstore.c: cpu_mips_instr_loadstore.c generate_mips_loadstore
+	./generate_mips_loadstore > tmp_mips_loadstore.c
 
-memory_mips.c: ../memory_rw.c memory_mips_v2p.c
+tmp_mips_loadstore_multi.c: generate_mips_loadstore_multi
+	./generate_mips_loadstore_multi > tmp_mips_loadstore_multi.c
 
 tmp_mips_head.c: generate_head
 	./generate_head mips MIPS > tmp_mips_head.c
@@ -180,9 +145,7 @@
 ###############################################################################
 
 cpu_ppc.o: cpu_ppc.c cpu_ppc_instr.c cpu_dyntrans.c memory_ppc.c \
-	../memory_rw.c tmp_ppc_head.c tmp_ppc_tail.c
-
-cpu_ppc_instr.c: tmp_ppc_loadstore.c
+	../memory_rw.c tmp_ppc_head.c tmp_ppc_tail.c tmp_ppc_loadstore.c
 
 tmp_ppc_loadstore.c: cpu_ppc_instr_loadstore.c generate_ppc_loadstore
 	./generate_ppc_loadstore > tmp_ppc_loadstore.c
@@ -209,7 +172,10 @@
 ###############################################################################
 
 cpu_sparc.o: cpu_sparc.c cpu_sparc_instr.c cpu_dyntrans.c ../memory_rw.c \
-	tmp_sparc_head.c tmp_sparc_tail.c
+	tmp_sparc_head.c tmp_sparc_tail.c tmp_sparc_loadstore.c
+
+tmp_sparc_loadstore.c: cpu_sparc_instr_loadstore.c generate_sparc_loadstore
+	./generate_sparc_loadstore > tmp_sparc_loadstore.c
 
 tmp_sparc_head.c: generate_head
 	./generate_head sparc SPARC > tmp_sparc_head.c
@@ -219,18 +185,6 @@
 
 
 ###############################################################################
-
-cpu_x86.o: cpu_x86.c cpu_x86_instr.c cpu_dyntrans.c ../memory_rw.c \
-	memory_x86.c tmp_x86_head.c tmp_x86_tail.c
-
-tmp_x86_head.c: generate_head
-	./generate_head x86 x86 > tmp_x86_head.c
-
-tmp_x86_tail.c: generate_tail
-	./generate_tail x86 x86 > tmp_x86_tail.c
-
-
-###############################################################################
 
 clean:
 	rm -f $(OBJS) $(TOOLS) *core tmp_*.c *.gmon experiment_arm_multi