--- trunk/src/cpus/Makefile.skel	2007/10/08 16:18:51	14
+++ trunk/src/cpus/Makefile.skel	2007/10/08 16:19:56	24
@@ -1,12 +1,12 @@
 #
-#  $Id: Makefile.skel,v 1.7 2005/09/26 00:08:03 debug Exp $
+#  $Id: Makefile.skel,v 1.22 2006/06/17 10:49:16 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)
+OBJS=$(CPU_ARCHS) $(CPU_BACKENDS)
 TOOLS=generate_head generate_tail $(CPU_TOOLS)
 
 
@@ -21,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 \
@@ -36,10 +31,10 @@
 tmp_alpha_misc.c: cpu_alpha_instr_loadstore.c generate_alpha_misc
 	./generate_alpha_misc > tmp_alpha_misc.c
 
-tmp_alpha_head.c:
+tmp_alpha_head.c: generate_head
 	./generate_head alpha Alpha > tmp_alpha_head.c
 
-tmp_alpha_tail.c:
+tmp_alpha_tail.c: generate_tail
 	./generate_tail alpha Alpha > tmp_alpha_tail.c
 
 
@@ -48,16 +43,57 @@
 cpu_arm.o: cpu_arm.c cpu_arm_instr.c cpu_dyntrans.c ../memory_rw.c \
 	tmp_arm_head.c tmp_arm_tail.c
 
+cpu_arm_instr.c: cpu_arm_instr_misc.c
+
 tmp_arm_loadstore.c: cpu_arm_instr_loadstore.c generate_arm_loadstore
 	./generate_arm_loadstore > tmp_arm_loadstore.c
 
-tmp_arm_dpi.c: cpu_arm_instr_dpi.c
+tmp_arm_multi.c: generate_arm_multi cpu_arm_multi.txt
+	./generate_arm_multi `cat cpu_arm_multi.txt` > tmp_arm_multi.c
+
+tmp_arm_dpi.c: cpu_arm_instr_dpi.c generate_arm_dpi
 	./generate_arm_dpi > tmp_arm_dpi.c
 
-tmp_arm_head.c:
+tmp_arm_r0.c: generate_arm_r
+	./generate_arm_r 0x000 0x0ff > tmp_arm_r0.c
+tmp_arm_r1.c: generate_arm_r
+	./generate_arm_r 0x100 0x1ff > tmp_arm_r1.c
+tmp_arm_r2.c: generate_arm_r
+	./generate_arm_r 0x200 0x2ff > tmp_arm_r2.c
+tmp_arm_r3.c: generate_arm_r
+	./generate_arm_r 0x300 0x3ff > tmp_arm_r3.c
+tmp_arm_r4.c: generate_arm_r
+	./generate_arm_r 0x400 0x4ff > tmp_arm_r4.c
+tmp_arm_r5.c: generate_arm_r
+	./generate_arm_r 0x500 0x5ff > tmp_arm_r5.c
+tmp_arm_r6.c: generate_arm_r
+	./generate_arm_r 0x600 0x6ff > tmp_arm_r6.c
+tmp_arm_r7.c: generate_arm_r
+	./generate_arm_r 0x700 0x7ff > tmp_arm_r7.c
+tmp_arm_r8.c: generate_arm_r
+	./generate_arm_r 0x800 0x8ff > tmp_arm_r8.c
+tmp_arm_r9.c: generate_arm_r
+	./generate_arm_r 0x900 0x9ff > tmp_arm_r9.c
+tmp_arm_ra.c: generate_arm_r
+	./generate_arm_r 0xa00 0xaff > tmp_arm_ra.c
+tmp_arm_rb.c: generate_arm_r
+	./generate_arm_r 0xb00 0xbff > tmp_arm_rb.c
+tmp_arm_rc.c: generate_arm_r
+	./generate_arm_r 0xc00 0xcff > tmp_arm_rc.c
+tmp_arm_rd.c: generate_arm_r
+	./generate_arm_r 0xd00 0xdff > tmp_arm_rd.c
+tmp_arm_re.c: generate_arm_r
+	./generate_arm_r 0xe00 0xeff > tmp_arm_re.c
+tmp_arm_rf.c: generate_arm_r
+	./generate_arm_r 0xf00 0xfff > tmp_arm_rf.c
+
+tmp_arm_r.c: generate_arm_r
+	./generate_arm_r 0 0 > tmp_arm_r.c
+
+tmp_arm_head.c: generate_head
 	./generate_head arm ARM > tmp_arm_head.c
 
-tmp_arm_tail.c:
+tmp_arm_tail.c: generate_tail
 	./generate_tail arm ARM > tmp_arm_tail.c
 
 
@@ -66,10 +102,10 @@
 cpu_avr.o: cpu_avr.c cpu_avr_instr.c cpu_dyntrans.c ../memory_rw.c \
 	tmp_avr_head.c tmp_avr_tail.c
 
-tmp_avr_head.c:
+tmp_avr_head.c: generate_head
 	./generate_head avr AVR > tmp_avr_head.c
 
-tmp_avr_tail.c:
+tmp_avr_tail.c: generate_tail
 	./generate_tail avr AVR > tmp_avr_tail.c
 
 
@@ -78,10 +114,10 @@
 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:
+tmp_hppa_head.c: generate_head
 	./generate_head hppa HPPA > tmp_hppa_head.c
 
-tmp_hppa_tail.c:
+tmp_hppa_tail.c: generate_tail
 	./generate_tail hppa HPPA > tmp_hppa_tail.c
 
 
@@ -90,10 +126,10 @@
 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:
+tmp_i960_head.c: generate_head
 	./generate_head i960 i960 > tmp_i960_head.c
 
-tmp_i960_tail.c:
+tmp_i960_tail.c: generate_tail
 	./generate_tail i960 i960 > tmp_i960_tail.c
 
 
@@ -102,10 +138,10 @@
 cpu_ia64.o: cpu_ia64.c cpu_ia64_instr.c cpu_dyntrans.c ../memory_rw.c \
 	tmp_ia64_head.c tmp_ia64_tail.c
 
-tmp_ia64_head.c:
+tmp_ia64_head.c: generate_head
 	./generate_head ia64 IA64 > tmp_ia64_head.c
 
-tmp_ia64_tail.c:
+tmp_ia64_tail.c: generate_tail
 	./generate_tail ia64 IA64 > tmp_ia64_tail.c
 
 
@@ -114,34 +150,42 @@
 cpu_m68k.o: cpu_m68k.c cpu_m68k_instr.c cpu_dyntrans.c ../memory_rw.c \
 	tmp_m68k_head.c tmp_m68k_tail.c
 
-tmp_m68k_head.c:
+tmp_m68k_head.c: generate_head
 	./generate_head m68k M68K > tmp_m68k_head.c
 
-tmp_m68k_tail.c:
+tmp_m68k_tail.c: generate_tail
 	./generate_tail m68k M68K > tmp_m68k_tail.c
 
 
 ###############################################################################
 
-cpu_mips.o: cpu_mips.c cpu_mips16.c cpu_dyntrans.c memory_mips.c
+cpu_mips.o: cpu_mips.c cpu_dyntrans.c memory_mips.c \
+	cpu_mips_instr.c tmp_mips_loadstore.c tmp_mips_head.c tmp_mips_tail.c
 
 memory_mips.c: ../memory_rw.c memory_mips_v2p.c
 
+tmp_mips_loadstore.c: cpu_mips_instr_loadstore.c generate_mips_loadstore
+	./generate_mips_loadstore > tmp_mips_loadstore.c
+
+tmp_mips_head.c: generate_head
+	./generate_head mips MIPS > tmp_mips_head.c
+
+tmp_mips_tail.c: generate_tail
+	./generate_tail mips MIPS > tmp_mips_tail.c
+
 
 ###############################################################################
 
 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
 
-tmp_ppc_head.c:
+tmp_ppc_head.c: generate_head
 	./generate_head ppc PPC > tmp_ppc_head.c
 
-tmp_ppc_tail.c:
+tmp_ppc_tail.c: generate_tail
 	./generate_tail ppc PPC > tmp_ppc_tail.c
 
 
@@ -150,10 +194,10 @@
 cpu_sh.o: cpu_sh.c cpu_sh_instr.c cpu_dyntrans.c ../memory_rw.c \
 	tmp_sh_head.c tmp_sh_tail.c
 
-tmp_sh_head.c:
+tmp_sh_head.c: generate_head
 	./generate_head sh SH > tmp_sh_head.c
 
-tmp_sh_tail.c:
+tmp_sh_tail.c: generate_tail
 	./generate_tail sh SH > tmp_sh_tail.c
 
 
@@ -162,31 +206,29 @@
 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_head.c: generate_head
 	./generate_head sparc SPARC > tmp_sparc_head.c
 
-tmp_sparc_tail.c:
+tmp_sparc_tail.c: generate_tail
 	./generate_tail sparc SPARC > tmp_sparc_tail.c
 
 
 ###############################################################################
 
 cpu_x86.o: cpu_x86.c cpu_x86_instr.c cpu_dyntrans.c ../memory_rw.c \
-	tmp_x86_head.c tmp_x86_tail.c
-
-memory_x86.c: ../memory_rw.c
+	memory_x86.c tmp_x86_head.c tmp_x86_tail.c
 
-tmp_x86_head.c:
+tmp_x86_head.c: generate_head
 	./generate_head x86 x86 > tmp_x86_head.c
 
-tmp_x86_tail.c:
+tmp_x86_tail.c: generate_tail
 	./generate_tail x86 x86 > tmp_x86_tail.c
 
 
 ###############################################################################
 
 clean:
-	rm -f $(OBJS) $(TOOLS) *core tmp_*.c *.gmon
+	rm -f $(OBJS) $(TOOLS) *core tmp_*.c *.gmon experiment_arm_multi
 
 clean_all: clean
 	rm -f Makefile