--- uae/src/Makefile.in	2018/04/24 16:38:39	1.1
+++ uae/src/Makefile.in	2018/04/24 16:39:05	1.1.1.2
@@ -5,13 +5,18 @@
 @SET_MAKE@
 CC        = @CC@
 CPP       = @CPP@
+LDFLAGS   = @LDFLAGS@
 CFLAGS    = @CFLAGS@ -D__inline__=@ac_cv_c_inline@ -DSTATFS_NO_ARGS=@STATFS_NO_ARGS@ -DSTATBUF_BAVAIL=@STATBUF_BAVAIL@ -DBROKEN_JOYSTICK_H=@BROKEN_JOYSTICK_H@ $(AFINCLUDE)
-X_CFLAGS  = @X_CFLAGS@
+X_CFLAGS  = @X_CFLAGS@ -DFORMS_H_VARIANT=@FORMS_H_VARIANT@
 TARGET    = @TARGET@
 LIBRARIES = @LIBRARIES@ @LIBS@
 GFXOBJS   = @GFXOBJS@
 ASMOBJS   = @ASMOBJS@
 CPUOBJS   = @CPUOBJS@
+CPUOBJS1  = @CPUOBJS1@
+DEBUGOBJS = @DEBUGOBJS@
+MATHLIB   = @MATHLIB@
+
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA    = @INSTALL_DATA@
@@ -21,7 +26,7 @@ bindir          = @bindir@
 libdir          = @libdir@
 sysconfdir      = @sysconfdir@
 
-.SUFFIXES: .o .c .h .m
+.SUFFIXES: .o .c .h .m .i
 
 # If you want to use the AF System to play sound, set theese to the
 # correct paths. If not, leave them commented out.
@@ -29,19 +34,22 @@ sysconfdir      = @sysconfdir@
 #AFINCLUDE=-I/usr/local/vol/AudioFile/include
 #AFLDFLAGS=-L/usr/local/vol/AudioFile/lib -lAF
 
-INCLUDES=-Iinclude
+INCLUDES=-I@top_srcdir@/src/include/ -I@top_srcdir@/src/
+
+OBJS = main.o newcpu.o memory.o custom.o cia.o serial.o disk.o blitter.o os.o \
+       autoconf.o ersatz.o filesys.o hardfile.o keybuf.o expansion.o zfile.o \
+       fpp.o readcpu.o cpudefs.o gfxutil.o gfxlib.o blitfunc.o blittable.o \
+       compiler.o uaelib.o execlib.o timerdev.o machdep/support.o cpustbl.o \
+       $(ASMOBJS) $(CPUOBJS) $(CPUOBJS1) $(GFXOBJS) $(DEBUGOBJS) cpustbl_d.o
 
-OBJS = main.o newcpu.o memory.o debug.o custom.o cia.o disk.o blitter.o $(GFXOBJS) \
-       autoconf.o os.o ersatz.o filesys.o hardfile.o keybuf.o expansion.o zfile.o \
-       fpp.o readcpu.o cpudefs.o gfxutil.o gfxlib.o blitfunc.o blittable.o $(ASMOBJS) \
-       compiler.o serial.o uaelib.o execlib.o $(CPUOBJS) cpustbl.o
-       
 all: $(TARGET)
 
 x11: progs
 
 svgalib: progs
 
+amigaos: progs
+
 be: progs
 
 next: progs
@@ -55,20 +63,20 @@ readdisk: readdisk.o
 	$(CC) readdisk.o -o readdisk $(LDFLAGS) $(DEBUGFLAGS)
 
 uae: $(OBJS)
-	$(CC) $(OBJS) -o uae $(GFXLDFLAGS) $(AFLDFLAGS) $(LDFLAGS) $(DEBUGFLAGS) $(LIBRARIES) -lm
+	$(CC) $(OBJS) -o uae $(GFXLDFLAGS) $(AFLDFLAGS) $(LDFLAGS) $(DEBUGFLAGS) $(LIBRARIES) $(MATHLIB)
 
 clean:
-	-rm -f *.o uae readdisk
+	-rm -f $(OBJS) *.o uae readdisk
 	-rm -f gencpu genblitter build68k cpudefs.c cpuopti
 	-rm -f cpu?.c blit.h
-	-rm -f cputbl.h cpustbl.c cpu_fast?.s
+	-rm -f cputbl.h cpustbl.c cpu_f?.s cpu_f_d?.s
 	-rm -f blitfunc.c blitfunc.h blittable.c config.h
 
 halfclean:
-	-rm -f $(OBJS) $(GFXOBJS)
+	-rm -f $(OBJS)
 
 streifenfrei: clean
-	-rm -f Makefile config.cache config.log config.status include/sysconfig.h
+	-rm -f Makefile config.cache config.log config.status include/sysconfig.h machdep
 
 blit.h: genblitter
 	./genblitter i >blit.h
@@ -79,8 +87,8 @@ blitfunc.h: genblitter
 blittable.c: genblitter blitfunc.h
 	./genblitter t >blittable.c
 
-genblitter: genblitter.o
-	$(CC) $(LDFLAGS) -o genblitter genblitter.o
+genblitter: genblitter.o blitops.o
+	$(CC) $(LDFLAGS) -o genblitter genblitter.o blitops.o
 build68k: build68k.o
 	$(CC) $(LDFLAGS) -o build68k build68k.o
 cpuopti: cpuopti.o
@@ -165,103 +173,171 @@ cpuE.o: cpuE.c cputbl.h
 cpuF.o: cpuF.c cputbl.h
 	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
        
-cpu_fast0.o: cpu_fast0.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast1.o: cpu_fast1.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast2.o: cpu_fast2.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast3.o: cpu_fast3.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast4.o: cpu_fast4.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast5.o: cpu_fast5.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast6.o: cpu_fast6.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast7.o: cpu_fast7.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast8.o: cpu_fast8.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast9.o: cpu_fast9.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fastA.o: cpu_fastA.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fastB.o: cpu_fastB.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fastC.o: cpu_fastC.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fastD.o: cpu_fastD.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fastE.o: cpu_fastE.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fastF.o: cpu_fastF.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-
-cpu_fast0.s: cpu0.c cputbl.h cpuopti
+cpu_d0.o: cpu0.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu0.c -o $@
+cpu_d1.o: cpu1.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu1.c -o $@
+cpu_d2.o: cpu2.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu2.c -o $@
+cpu_d3.o: cpu3.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu3.c -o $@
+cpu_d4.o: cpu4.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu4.c -o $@
+cpu_d5.o: cpu5.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu5.c -o $@
+cpu_d6.o: cpu6.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu6.c -o $@
+cpu_d7.o: cpu7.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu7.c -o $@
+cpu_d8.o: cpu8.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu8.c -o $@
+cpu_d9.o: cpu9.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu9.c -o $@
+cpu_dA.o: cpuA.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpuA.c -o $@
+cpu_dB.o: cpuB.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpuB.c -o $@
+cpu_dC.o: cpuC.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpuC.c -o $@
+cpu_dD.o: cpuD.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpuD.c -o $@
+cpu_dE.o: cpuE.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpuE.c -o $@
+cpu_dF.o: cpuF.c cputbl.h
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpuF.c -o $@
+       
+cpu_f0.s: cpu0.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fast1.s: cpu1.c cputbl.h cpuopti
+cpu_f1.s: cpu1.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fast2.s: cpu2.c cputbl.h cpuopti
+cpu_f2.s: cpu2.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fast3.s: cpu3.c cputbl.h cpuopti
+cpu_f3.s: cpu3.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fast4.s: cpu4.c cputbl.h cpuopti
+cpu_f4.s: cpu4.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fast5.s: cpu5.c cputbl.h cpuopti
+cpu_f5.s: cpu5.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fast6.s: cpu6.c cputbl.h cpuopti
+cpu_f6.s: cpu6.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fast7.s: cpu7.c cputbl.h cpuopti
+cpu_f7.s: cpu7.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fast8.s: cpu8.c cputbl.h cpuopti
+cpu_f8.s: cpu8.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fast9.s: cpu9.c cputbl.h cpuopti
+cpu_f9.s: cpu9.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fastA.s: cpuA.c cputbl.h cpuopti
+cpu_fA.s: cpuA.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fastB.s: cpuB.c cputbl.h cpuopti
+cpu_fB.s: cpuB.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fastC.s: cpuC.c cputbl.h cpuopti
+cpu_fC.s: cpuC.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fastD.s: cpuD.c cputbl.h cpuopti
+cpu_fD.s: cpuD.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fastE.s: cpuE.c cputbl.h cpuopti
+cpu_fE.s: cpuE.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
-cpu_fastF.s: cpuF.c cputbl.h cpuopti
+cpu_fF.s: cpuF.c cputbl.h cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	cpuopti <cpu-tmp.s >$@
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+
+cpu_f_d0.s: cpu0.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_d1.s: cpu1.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_d2.s: cpu2.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_d3.s: cpu3.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_d4.s: cpu4.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_d5.s: cpu5.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_d6.s: cpu6.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_d7.s: cpu7.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_d8.s: cpu8.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_d9.s: cpu9.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_dA.s: cpuA.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_dB.s: cpuB.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_dC.s: cpuC.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_dD.s: cpuD.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_dE.s: cpuE.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
+	rm cpu-tmp.s
+cpu_f_dF.s: cpuF.c cputbl.h cpuopti
+	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
+	./cpuopti <cpu-tmp.s >$@
 	rm cpu-tmp.s
+	
+cpustbl_d.o: cpustbl.c cputbl.h
+	$(CC) -c -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpustbl.c -o $@
 
 bebox.o: bebox.cpp
 	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) bebox.cpp
@@ -269,15 +345,19 @@ bebox.o: bebox.cpp
 .m.o:
 	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $*.m
 .c.o:
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $*.c
+	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $*.c -o $@
 .c.s:
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
+.c.i:
+	$(CC) $(INCLUDES) -E $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c > $@
 .S.o:
 	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $*.S
+.s.o:
+	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $*.s
 
 # Saves recompiling...
 touch:
-	touch *.o; touch build68k; touch cpudefs.c; touch cpudefs.o; touch gencpu genblitter; touch cpu?.c cpu*tbl.[ch]; touch cpu?.o cpu*tbl.o
+	touch *.o; touch build68k; touch cpudefs.c; touch cpudefs.o; touch gencpu; touch cpu?.c cpu*tbl.[ch]; touch cpuopti.o cpuopti cpu?.o cpu_f?.s cpu_f?.o cpu_f_d?.s cpu_f_d?.o cpu*tbl.o cpustbl_d.o
 
 # Some more dependencies...
 cpustbl.o: cputbl.h