--- gforth/Makefile.in	2003/11/02 18:18:35	1.286
+++ gforth/Makefile.in	2006/02/17 16:23:10	1.314
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -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
@@ -109,7 +109,9 @@ XLDFLAGS = @LDFLAGS@
 LDFLAGS	=  $(DEBUGFLAG) $(XLDFLAGS)
 LDLIBS	= @LIBS@
 
-# ------------	Install Directorys
+STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@
+
+# ------------	Install Directories
 
 VPATH = @srcdir@
 prefix = @prefix@
@@ -177,7 +179,8 @@ KERN_SRC = \
 	kernel/saccept.fs \
 	kernel/doers.fs \
 	kernel/getdoers.fs \
-	kernel/pass.fs
+	kernel/pass.fs \
+	kernel/xchars.fs
 
 EC_SRC = \
 	asm/README \
@@ -200,8 +203,10 @@ GFORTH_FI_SRC = \
 	blocks.fs \
 	bufio.fs \
 	code.fs \
+	complex.fs \
 	debug.fs \
 	debugs.fs \
+	dis-gdb.fs \
 	ekey.fs \
 	savesys.fs \
 	environ.fs \
@@ -210,6 +215,7 @@ GFORTH_FI_SRC = \
 	except.fs \
 	extend.fs \
 	float.fs \
+	fft.fs \
 	glocals.fs \
 	hash.fs \
 	history.fs \
@@ -227,19 +233,22 @@ GFORTH_FI_SRC = \
 	stuff.fs \
 	tasker.fs \
 	termsize.fs \
+	utf-8.fs \
 	vt100.fs \
 	vt100key.fs \
 	wordinfo.fs \
 	arch/386/asm.fs arch/386/disasm.fs \
-	arch/alpha/asm.fs arch/alpha/disasm.fs \
-	arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs
+	arch/amd64/asm.fs arch/amd64/disasm.fs \
+	arch/alpha/asm.fs arch/alpha/disasm.fs arch/alpha/testasm.fs\
+	arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs \
+	arch/mips/testasm.fs arch/mips/testdisasm.fs
 
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \
 	ans-report.fs ansi.fs answords.fs \
 	colorize.fs comp-i.fs \
-	dosekey.fs doskey.fs ds2texi.fs \
+	depth-changes.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-util.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,10 +257,11 @@ 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 test/coreext.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 \
-	add.fs lib.fs oldlib.fs fflib.fs sieve.fs unix/socket.fs
+	add.fs lib.fs oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs
 
 COMPAT = compat/README \
 	compat/anslocal.fs \
@@ -259,6 +269,7 @@ COMPAT = compat/README \
 	compat/control.fs \
 	compat/defer.fs \
 	compat/exception.fs \
+	compat/execute-parsing.fs \
 	compat/loops.fs \
 	compat/required.fs \
 	compat/strcomp.fs \
@@ -295,25 +306,13 @@ 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 \
 	arch/misc/tt.fs \
-	arch/6502/asm.fs \
 	arch/6502/prim.fs \
 	arch/6502/mach.fs \
-	arch/6502/zero.fs \
-	arch/6502/softuart.fs \
-	arch/6502/cold.fs \
-	arch/8086/asm.fs \
-	arch/8086/mach.fs \
-	arch/8086/mach.sh \
-	arch/8086/prim.fs \
-	arch/avr/asm.fs \
-	arch/c165/asm.fs \
-	arch/c165/mach.fs \
-	arch/c165/prim.fs \
-	arch/h8/asm.fs \
 	arch/shboom/asm.fs \
 	arch/shboom/compiler.fs \
 	arch/shboom/dis.fs \
@@ -325,11 +324,27 @@ ARCHS =	\
 	arch/sharc/mach.fs \
 	arch/sharc/machine.h \
 	arch/sharc/compile.sharc \
-	arch/sharc/unistd.h \
 	arch/sharc/systypes.h \
 	arch/sharc/types.h \
 	arch/sharc/g21k-3.3.4-bp1.diff
 
+#not included in distribution until distribution terms are included:
+ARCHS_NO_DIST = \
+	arch/6502/asm.fs \
+	arch/6502/cold.fs \
+	arch/6502/softuart.fs \
+	arch/6502/zero.fs \
+	arch/8086/asm.fs \
+	arch/8086/mach.fs \
+	arch/8086/mach.sh \
+	arch/8086/prim.fs \
+	arch/avr/asm.fs \
+	arch/c165/asm.fs \
+	arch/c165/mach.fs \
+	arch/c165/prim.fs \
+	arch/h8/asm.fs \
+	arch/sharc/unistd.h
+
 VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
 	vmgen-ex/engine.c vmgen-ex/fib.mini \
 	vmgen-ex/mini-inst.vmg vmgen-ex/mini-super.vmg vmgen-ex/mini.h \
@@ -350,7 +365,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 \
@@ -434,6 +450,8 @@ kernel/version.fs:	version
 	echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
 
 more:	engines $(FORTH_GEN) $(GEN)
+	@make check
+	@$(FORTH_FAST) --diag -e bye
 
 #from the gcc Makefile: 
 #"Deletion of files made during compilation.
@@ -474,7 +492,8 @@ distclean:	clean
 		-$(RM) -rf config.cache config.log config.status \
 		engine/config.h Makefile Makedist engine/Makefile \
 		stamp-h engine/stamp-h \
-		doc/version.texi gforthmi vmgen
+		doc/version.texi gforthmi vmgen \
+		prim-fast.b $(FORTH_GEN_ENGINE_FAST)
 
 #realclean is useless, but dangerous, so it's commented out
 realclean:	distclean
@@ -596,7 +615,7 @@ check:		gforths	gforth.fi
 		@echo "*** Check successful ***"
 
 checkone test:	gforth$(EXE) gforth.fi
-		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/gforth.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
+		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/gforth.fs test/deferred.fs test/coreext.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
 		$(FORTH) test/other.fs -e bye
 		$(FORTHS) test/signals.fs -e bye
 		$(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out
@@ -604,6 +623,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" mach32b.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"
@@ -703,18 +728,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 cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg
+		m4 -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -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 $@-
@@ -757,7 +783,7 @@ gforths: $(ENGINES) $(ENGINES_FAST)
 engines:	FORCE $(FORTH_GEN_ENGINE) engine/Makefile
 		cd engine && $(MAKE) $(ENGINES)
 
-engines-fast:	FORCE $(FORTH_GEN_ENGINES_FAST) engine/Makefile
+engines-fast:	FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile
 		cd engine && $(MAKE) $(ENGINES_FAST)
 
 # ------------- additional C primitives