--- gforth/Makefile.in	2003/10/30 10:31:58	1.285
+++ gforth/Makefile.in	2004/05/08 17:14:29	1.295
@@ -76,7 +76,7 @@ FORTHS	= $(ENGINE) $(FORTHS_ARGS)
 # possible to override this variable at the command line for an initial build (jaw)
 BUILDFORTH = $(ENGINE) --die-on-signal -m 4M -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
 # the forth system plus flags we use to build
-FORTHB = $(BUILDFORTH) -e 3 exboot.fs -e 'fpath= .|~+|$(srcdir)'
+FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)'
 # the Forth system for running prims2x.fs
 FORTHP = $(FORTH)
 ENGINE_FAST = $(ENGINE)-fast
@@ -86,7 +86,7 @@ FORTHK	= $(ENGINE) $(FORTHKFLAGS)
 #FORTHP	= $(ENGINE) --die-on-signal -i ./$(kernel_fi)
 #the "-2 image-included-files +!" undoes the change to image-included-files
 # in exboot.fs
-STARTUP	= -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@
+STARTUP	= exboot.fs startup.fs @asm_fs@ @disasm_fs@
 STRIP	= strip
 TEXI2DVI = texi2dvi -e
 TEXI2PDF = texi2dvi --pdf -e
@@ -239,7 +239,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	colorize.fs comp-i.fs \
 	dosekey.fs doskey.fs ds2texi.fs \
 	envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
-	glosgen.fs gray.fs httpd.fs proxy.fs \
+	fsl-utils.4th glosgen.fs gray.fs httpd.fs proxy.fs \
 	make-app.fs doc/makedoc.fs \
 	locate.fs more.fs other.fs prims2x.fs random.fs \
 	sokoban.fs string.fs table.fs tags.fs \
@@ -248,6 +248,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
 	test/string.fs test/float.fs test/gforth.fs \
 	test/other.fs test/signals.fs test/checkans.fs \
+	test/primtest.fs \
 	bubble.fs siev.fs matrix.fs fib.fs \
 	oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \
 	moofglos.fs fixpath.fs \
@@ -295,6 +296,7 @@ ARCHS =	\
 	arch/misc/README \
 	arch/misc/asm.fs \
 	arch/misc/mach.fs \
+	arch/misc/optcmove.fs \
 	arch/misc/prim.fs \
 	arch/misc/sim.fs \
 	arch/misc/sokoban.fs \
@@ -350,7 +352,8 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \
 	doc/vmgen.texi doc/fdl.texi doc/gpl.texi \
 	gforth.el \
-	prim peeprules.vmg engine/engine.c engine/main.c \
+	prim cache0.vmg cache1.vmg peeprules.vmg \
+	engine/engine.c engine/main.c \
 	engine/io.c engine/support.c engine/signals.c \
 	$(ARCHS) \
 	engine/profile.c \
@@ -372,9 +375,11 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 
 RCS_FILES =  ToDo model high-level
 
-ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) $(PROFEXES) #gforth-native$(EXE)
+ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-itc$(EXE) $(PROFEXES)
 
-GEN = $(ENGINES) kernel/version.fs
+ENGINES_FAST = gforth-fast$(EXE) gforth-native$(EXE) 
+
+GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs
 
 # things that need a working forth system to be generated
 FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \
@@ -602,6 +607,12 @@ checkone test:	gforth$(EXE) gforth.fi
 		  "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \
 		  tr -d '\015' | diff -c - $(srcdir)/engine/prim.i
 
+test/primtest.fi: test/primtest.fs mach32l.fs cross.fs
+		$(FORTHB) -e 's" mach32l.fs"' $(srcdir)/test/primtest.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye"
+
+primtest:	gforth gforth-native test/primtest.fi FORCE
+		(echo rs|ENVVAR=bla ./gforth -i test/primtest.fi) && (echo rs|ENVVAR=bla ./gforth-native -i test/primtest.fi); echo $$?
+
 bench:		gforth-fast$(EXE) gforth.fi
 		@echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
 		time $(FORTH_FAST) siev.fs -e "main bye"
@@ -701,18 +712,19 @@ gforth.fi:	$(kernel_fi) gforthmi gforth$
 
 # -------------	Make c-engine
 
-prim.b:		prim peeprules.vmg
+prim.b:		prim cache0.vmg
 		m4 -s $(srcdir)/prim >$@
 		sleep 1 #should make hpux-workaround unnecessary
 
-prim-fast.b:    prim.b
-		cp prim.b prim-fast.b
+prim-fast.b:	prim cache1.vmg peeprules.vmg
+		m4 -DM4_ENGINE_FAST -s $(srcdir)/prim >$@
+		sleep 1 #should make hpux-workaround unnecessary
 
 $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs
-		GFORTH="$(FORTHP)" gfgen -fast
+		GFORTH="$(FORTHP)" $(srcdir)/gfgen -fast
 
 $(FORTH_GEN_ENGINE): prim.b prims2x.fs
-		GFORTH="$(FORTHP)" gfgen
+		GFORTH="$(FORTHP)" $(srcdir)/gfgen
 
 kernel/aliases.fs:	prim.b prims2x.fs kernel/aliases0.fs
 		$(CP) kernel/aliases0.fs $@-
@@ -731,11 +743,11 @@ gforth$(EXE):		engines
 		$(CP) engine/$@ $@
 		@GFORTH_EXE@
 
-gforth-fast$(EXE):	engines
+gforth-fast$(EXE):	engines-fast
 		$(CP) engine/$@ $@
 		@GFORTHFAST_EXE@
 
-gforth-native$(EXE):	engines
+gforth-native$(EXE):	engines-fast
 		$(CP) engine/$@ $@
 #@GFORTHX_EXE@
 
@@ -750,11 +762,14 @@ gforth-ditc$(EXE):	engines
 gforth-prof$(EXE):	engines
 		$(CP) engine/$@ $@
 
-gforths: $(ENGINES)
+gforths: $(ENGINES) $(ENGINES_FAST)
 
 engines:	FORCE $(FORTH_GEN_ENGINE) engine/Makefile
 		cd engine && $(MAKE) $(ENGINES)
 
+engines-fast:	FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile
+		cd engine && $(MAKE) $(ENGINES_FAST)
+
 # ------------- additional C primitives
 
 %.c:		%.pri prim2cl.fs