--- gforth/Makefile.in 2005/01/22 12:20:37 1.305 +++ gforth/Makefile.in 2006/02/20 22:20:16 1.315 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc. #This file is part of Gforth. @@ -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@ @@ -138,7 +140,7 @@ CVSDIRS = CVS engine/CVS kernel/CVS doc/ arch/alpha/CVS arch/4stack/CVS arch/misc/CVS arch/6502/CVS \ arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \ arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS arch/amd64/CVS \ - arch/arm/CVS + arch/arm/CVS arch/r8c/CVS INCLUDES = engine/forth.h engine/threaded.h engine/io.h @@ -201,6 +203,7 @@ GFORTH_FI_SRC = \ blocks.fs \ bufio.fs \ code.fs \ + complex.fs \ debug.fs \ debugs.fs \ dis-gdb.fs \ @@ -212,6 +215,7 @@ GFORTH_FI_SRC = \ except.fs \ extend.fs \ float.fs \ + fft.fs \ glocals.fs \ hash.fs \ history.fs \ @@ -235,8 +239,9 @@ GFORTH_FI_SRC = \ wordinfo.fs \ arch/386/asm.fs arch/386/disasm.fs \ arch/amd64/asm.fs arch/amd64/disasm.fs \ - arch/alpha/asm.fs arch/alpha/disasm.fs \ - arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.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 \ @@ -252,11 +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/primtest.fs test/coreext.fs test/deferred.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 \ @@ -264,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 \ @@ -278,6 +284,7 @@ ALLSUBDIRS = engine ARCHS = \ arch/generic/machine.h \ + arch/generic/128bit.h \ arch/m68k/machine.h \ arch/mips/machine.h \ arch/386/machine.h \ @@ -320,7 +327,11 @@ ARCHS = \ arch/sharc/compile.sharc \ arch/sharc/systypes.h \ arch/sharc/types.h \ - arch/sharc/g21k-3.3.4-bp1.diff + arch/sharc/g21k-3.3.4-bp1.diff \ + arch/r8c/asm.fs \ + arch/r8c/asm-test.fs \ + arch/r8c/prim.fs \ + arch/r8c/mach.fs #not included in distribution until distribution terms are included: ARCHS_NO_DIST = \ @@ -378,13 +389,14 @@ SOURCES = $(CVSDIRS) compat Makefile.in gforthmi.cmd glosgen.glo doc/glossaries.doc \ $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \ timings.sc \ - test/coretest.out test/checkans.out + test/coretest.out test/checkans.out \ + cache-fast*.vmg RCS_FILES = ToDo model high-level ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-itc$(EXE) $(PROFEXES) -ENGINES_FAST = gforth-fast$(EXE) gforth-native$(EXE) +ENGINES_FAST = gforth-fast$(EXE) #gforth-native$(EXE) GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs @@ -408,8 +420,8 @@ FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs #distributed documentation -DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \ - doc/vmgen.info doc/vmgen.info-* doc/vmgen.ps +DOCDIST = doc/gforth.info doc/gforth.info* doc/gforth.ps \ + doc/vmgen.info doc/vmgen.info* doc/vmgen.ps KERNLS = kernl16b.fi- kernl16l.fi- \ kernl32b.fi- kernl32l.fi- \ @@ -486,7 +498,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 @@ -502,7 +515,7 @@ virtualclean: mostlyclean #rules in Makedist (you can use them with GNU make on these systems). dist: Makedist machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' -e 's/@[L]IBFFIFLAG@/false/g' machpc.fs $(MAKE) -f Makedist d$@ -$(RM) machpc.fs @@ -608,7 +621,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 test/deferred.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 @@ -617,7 +630,7 @@ checkone test: gforth$(EXE) gforth.fi 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" + $(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 $$? @@ -725,8 +738,8 @@ prim.b: prim cache0.vmg m4 -s $(srcdir)/prim >$@ sleep 1 #should make hpux-workaround unnecessary -prim-fast.b: prim cache1.vmg peeprules.vmg - m4 -DM4_ENGINE_FAST -s $(srcdir)/prim >$@ +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