--- gforth/Makefile.in 2002/01/14 08:40:23 1.215 +++ gforth/Makefile.in 2004/01/25 12:35:57 1.294 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. #This file is part of Gforth. @@ -30,14 +30,14 @@ # ------------- gforth version -VERSION = @VERSION@ +VERSION = @PACKAGE_VERSION@ DOSVERSION=`echo $(VERSION)|sed 's/\.//g'|sed 's/-.*//g'` # ------------- System specific variables machine=@machine@ kernel_fi=@kernel_fi@ -EXE=@EXE@ +EXE=@EXEEXT@ # this is the type of machine # used to extend the include path with ./arch/$machine @@ -57,24 +57,28 @@ CP = cp -p MV = mv TAR = tar cf - INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_INFO = @INSTALL_INFO@ LN_S = @LN_S@ GCC = @CC@ CC = $(GCC) FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) FORTHSIZES = @FORTHSIZES@ -FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir) +FORTHS_ARGS = -p "$(FORTHPATH)$(PATHSEP)$(srcdir)" +FORTH_ARGS = --die-on-signal $(FORTHS_ARGS) ENGINE = ./gforth FORTH = $(ENGINE) $(FORTH_ARGS) +FORTHS = $(ENGINE) $(FORTHS_ARGS) # the (existing) forth system to use for cross compiling and primitives tables # per default we use the one in this directory for a rebuild. It is also # 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 'fpath= .|~+|$(srcdir)' +FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)' # the Forth system for running prims2x.fs -FORTHP = $(FORTHB) +FORTHP = $(FORTH) ENGINE_FAST = $(ENGINE)-fast FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) @@ -82,10 +86,11 @@ 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 -DVI2PS = dvips -Z +TEXI2PDF = texi2dvi --pdf -e +DVI2PS = dvips -t letterSize -Z #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/ MAKEINFO = makeinfo TEXI2HTML = texi2html @@ -97,7 +102,7 @@ XDEFINES = @DEFS@ SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves DEBUGFLAG = @DEBUGFLAG@ -CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\" +CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH='"$(FORTHPATH)"' #John Wavrik should use -Xlinker -N to get a writable text (executable) XLDFLAGS = @LDFLAGS@ @@ -123,13 +128,17 @@ man1ext= .1 emacssitelispdir=@lispdir@ siteforthdir=$(datadir)/gforth/site-forth +PROFOBJS = @PROFOBJS@ +PROFEXES = @PROFEXES@ + CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \ compat/CVS unix/CVS \ arch/CVS arch/generic/CVS arch/m68k/CVS arch/mips/CVS \ arch/386/CVS arch/hppa/CVS arch/sparc/CVS arch/power/CVS \ 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/shboom/CVS arch/sharc/CVS arch/ia64/CVS arch/amd64/CVS \ + arch/arm/CVS INCLUDES = engine/forth.h engine/threaded.h engine/io.h @@ -190,6 +199,7 @@ GFORTH_FI_SRC = \ blocked.fb \ blocks.fs \ bufio.fs \ + code.fs \ debug.fs \ debugs.fs \ ekey.fs \ @@ -206,6 +216,7 @@ GFORTH_FI_SRC = \ intcomp.fs \ locals.fs \ look.fs \ + quotes.fs \ search.fs \ see.fs \ see-ext.fs \ @@ -225,21 +236,23 @@ GFORTH_FI_SRC = \ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ ans-report.fs ansi.fs answords.fs \ - code.fs colorize.fs comp-i.fs \ - doskey.fs ds2texi.fs \ + 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 \ make-app.fs doc/makedoc.fs \ - more.fs other.fs prims2x.fs random.fs \ - table.fs string.fs \ - tt.fs sokoban.fs \ + locate.fs more.fs other.fs prims2x.fs random.fs \ + sokoban.fs string.fs table.fs tags.fs \ + tt.fs \ unbuffer.fs wordsets.fs \ test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ - test/string.fs test/other.fs test/checkans.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 \ - add.fs lib.fs sieve.fs unix/socket.fs + add.fs lib.fs oldlib.fs fflib.fs sieve.fs unix/socket.fs COMPAT = compat/README \ compat/anslocal.fs \ @@ -249,11 +262,14 @@ COMPAT = compat/README \ compat/exception.fs \ compat/loops.fs \ compat/required.fs \ + compat/strcomp.fs \ compat/struct.fs \ compat/vocabulary.fs GFORTH_TEXI = doc/gforth.texi doc/version.texi +VMGEN_TEXI = doc/vmgen.texi doc/version.texi doc/fdl.texi + ALLSUBDIRS = engine ARCHS = \ @@ -266,9 +282,11 @@ ARCHS = \ arch/sparc/machine.h \ arch/power/machine.h \ arch/power/_sync_cache_range.c \ - arch/power/elf32ppc.x \ arch/alpha/machine.h \ + arch/arm/machine.h \ arch/ia64/machine.h \ + arch/ia64/flush_icache_block.c \ + arch/amd64/machine.h \ arch/4stack/README \ arch/4stack/asm.fs \ arch/4stack/mach.fs \ @@ -278,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 \ @@ -321,19 +340,26 @@ VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefil vmgen-ex/simple.mini vmgen-ex/stat.awk vmgen-ex/support.c \ vmgen-ex/test.mini vmgen-ex/test.out +VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-ex2/%) + SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \ - gforthmi.in vmgen.in README.vmgen \ + gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \ configure.in configure config.sub config.guess elisp-comp missing \ - acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \ - iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \ - COPYING AUTHORS ChangeLog Benchres aclocal.m4 \ + engine/config.h.in stamp-h.in \ + iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \ + BUILD-FROM-SCRATCH model \ + COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ 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 \ - engine/io.c engine/memcmpc.c engine/signals.c $(ARCHS) \ - engine/peephole.c engine/profile.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 \ engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \ - engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \ + engine/ecvt.c engine/memcmp.c engine/rint.c \ + engine/strtol.c engine/strtoul.c \ engine/ansidecl.h engine/memmove.c \ engine/pow10.c engine/atanh.c engine/cleanalign.c \ engine/strerror.c engine/strsignal.c engine/dblsub.c \ @@ -343,28 +369,49 @@ SOURCES = $(CVSDIRS) compat Makefile.in versions.bsh \ configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \ gforthmi.cmd glosgen.glo doc/glossaries.doc \ - $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) \ + $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \ timings.sc \ test/coretest.out test/checkans.out RCS_FILES = ToDo model high-level -GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-prof$(EXE) kernel/version.fs +ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-itc$(EXE) $(PROFEXES) + +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_GEN0 = prim.b engine/prim.i engine/prim_lab.i engine/prim_superend.i engine/peephole.i engine/profile.i kernel/aliases.fs kernel/prim.fs +FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \ + engine/prim_superend.i engine/profile.i \ + engine/prim_num.i engine/prim_grp.i \ + engine/costs.i engine/super2.i +FORTH_GEN_ENGINE_FAST= \ + engine/prim-fast.i engine/prim_lab-fast.i engine/prim_names-fast.i \ + engine/prim_superend-fast.i engine/profile-fast.i \ + engine/prim_num-fast.i engine/prim_grp-fast.i \ + engine/costs-fast.i engine/super2-fast.i +FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs +FORTH_GEN0 = prim.b $(FORTH_GEN_PRIMB) FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi # this is used for antidependences, FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ +#kernel dependencies +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 +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- \ kernl64b.fi- kernl64l.fi- -GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile Makedist engine/Makefile configure +GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \ + doc/gforth.texi doc/gforth.dvi doc/gforth.ps \ + doc/vmgen.dvi doc/vmgen.ps \ + Makefile Makedist engine/Makefile configure #standards.info recommends this: .SUFFIXES: @@ -389,7 +436,7 @@ kernel/version.fs: version $(MAKE) gforth$(EXE) echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs -more: engine $(FORTH_GEN) $(GEN) +more: engines $(FORTH_GEN) $(GEN) #from the gcc Makefile: #"Deletion of files made during compilation. @@ -421,12 +468,13 @@ docclean: FORCE doc/gforth.toc doc/gforth.tp doc/gforth.vr html clean: mostlyclean - -$(RM) -rf $(GEN) engine/gforth$(EXE) \ - engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \ - *.o engine/*.o arch/*/*.o version + -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \ + engine/gforth$(EXE) engine/gforth-fast$(EXE) \ + engine/gforth-native$(EXE) engine/gforth-itc$(EXE) \ + engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) distclean: clean - -$(RM) config.cache config.log config.status \ + -$(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 @@ -443,11 +491,16 @@ virtualclean: mostlyclean #Some makes (Ultrix, SunOS, IRIX) are so broken, they cannot read the #Makefile if it contains our dist rules. Therefore we have put these #rules in Makedist (you can use them with GNU make on these systems). -dist: Makedist FORCE + +dist: Makedist machpc.fs FORCE + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs $(MAKE) -f Makedist d$@ + -$(RM) machpc.fs -dosdist: Makedist FORCE +dosdist: Makedist machpc.fs FORCE + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs $(MAKE) -f Makedist d$@ + -$(RM) machpc.fs srcdist: Makedist FORCE $(MAKE) -f Makedist d$@ @@ -461,12 +514,20 @@ docdist: Makedist FORCE htmldist: Makedist FORCE $(MAKE) -f Makedist d$@ -bindist: Makedist FORCE +bindist: Makedist machpc.fs FORCE + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs $(MAKE) -f Makedist d$@ + -$(RM) machpc.fs -binonlydist: Makedist FORCE +binonlydist: Makedist machpc.fs FORCE + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs $(MAKE) -f Makedist d$@ + -$(RM) machpc.fs +#HPUX make breaks the cycle differently when the dates are equal, so +# touch some of the files if it acts up +hpux-workaround: + touch $(FORTH_GEN_PRIMB) #strip gforth, because the debugging stuff is hardly useful once # gforth manages to execute more than a few primitives. @@ -480,17 +541,20 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker touch $(siteforthdir)/siteinit.fs -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi $(bindir)/vmgen -$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) - $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) + -$(RM) $(bindir)/gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) + $(INSTALL_PROGRAM) gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE)) - $(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) + $(INSTALL_PROGRAM) gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE)) - $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION) - $(INSTALL_PROGRAM) vmgen $(bindir)/vmgen-$(VERSION) + $(INSTALL_PROGRAM) gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) + (cd $(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE)) + $(INSTALL_SCRIPT) gforthmi $(bindir)/gforthmi-$(VERSION) + $(INSTALL_SCRIPT) vmgen $(bindir)/vmgen-$(VERSION) $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION) (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi) (cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen) -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir) - -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done + -for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(infodir); done for i in $(FORTH_SRC) $(COMPAT) prim; do \ $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \ done @@ -501,12 +565,12 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ fi -$(RM) gforth.fi - GFORTHD="./gforth-ditc -p$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) + GFORTHD="./gforth-ditc -p $(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS $(RM) gforth.fi install.TAGS - @echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \ - echo "* Gforth: (gforth). A fast interpreter for the Forth language." + $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/gforth.info + $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/vmgen.info install-strip: install @@ -522,16 +586,32 @@ installdirs: mkinstalldirs #deinstall all files specific to this version of gforth #to uninstall version foo, type `make uninstall VERSION=foo' uninstall: FORCE - -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION) (bindir)/vmgen-$(VERSION) - @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforth-fast$(EXE) $(bindir)/gforthmi $(bindir)/vmgen $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth" + -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION) (bindir)/vmgen-$(VERSION) + @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-itc$(EXE) $(bindir)/gforthmi $(bindir)/vmgen $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth" + +check: gforths gforth.fi + $(MAKE) checkone ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-itc" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-ditc" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1 + @echo "*** Check successful ***" -check test: gforth$(EXE) gforth.fi - $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs -e bye | diff -c - $(srcdir)/test/coretest.out +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/other.fs -e bye - $(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.out + $(FORTHS) test/signals.fs -e bye + $(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out $(FORTH) prims2x.fs -e \ - "c-flag on s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \ - diff -c - $(srcdir)/engine/prim.i + "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)' @@ -540,6 +620,26 @@ bench: gforth-fast$(EXE) gforth.fi time $(FORTH_FAST) matrix.fs -e "main bye" time $(FORTH_FAST) fib.fs -e "main bye" +onebench: + @\time -f "siev %U" $(FORTH_FAST) siev.fs -e "main bye" + @\time -f "bubble %U" $(FORTH_FAST) -e "warnings off" bubble.fs -e "main bye" + @\time -f "matrix %U" $(FORTH_FAST) matrix.fs -e "main bye" + @\time -f "fib %U" $(FORTH_FAST) fib.fs -e "main bye" + +all-bench: gforth-fast$(EXE) gforth$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth.fi + @echo "*** gforth-fast dynamic:" + @$(MAKE) onebench ENGINE_FAST="./gforth-fast --dynamic" + @echo "*** gforth-fast not dynamic:" + @$(MAKE) onebench ENGINE_FAST="./gforth-fast --no-dynamic" + @echo "*** gforth dynamic:" + @$(MAKE) onebench ENGINE_FAST="./gforth --dynamic" + @echo "*** gforth not dynamic:" + @$(MAKE) onebench ENGINE_FAST="./gforth --no-dynamic" + @echo "*** gforth-itc:" + @$(MAKE) onebench ENGINE_FAST=./gforth-itc + @echo "*** gforth-ditc:" + @$(MAKE) onebench ENGINE_FAST=./gforth-ditc + # ------------- Make forth images # How to make new images: @@ -550,30 +650,31 @@ bench: gforth-fast$(EXE) gforth.fi # 3. copy new kernels to kernlXYZ.fi # these are the ones we want to use now -kernl16l.fi-: $(KERN_SRC) kernel/version.fs mach16l.fs machpc.fs $(FORTH_GEN0) +kernl16l.fi-: $(KERN_DEPS) mach16l.fs $(FORTHB) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" -kernl16b.fi-: $(KERN_SRC) kernel/version.fs mach16b.fs machpc.fs $(FORTH_GEN0) +kernl16b.fi-: $(KERN_DEPS) mach16b.fs $(FORTHB) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" -kernl32l.fi-: $(KERN_SRC) kernel/version.fs mach32l.fs machpc.fs $(FORTH_GEN0) +kernl32l.fi-: $(KERN_DEPS) mach32l.fs $(FORTHB) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" -kernl32b.fi-: $(KERN_SRC) kernel/version.fs mach32b.fs machpc.fs $(FORTH_GEN0) +kernl32b.fi-: $(KERN_DEPS) mach32b.fs $(FORTHB) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" -kernl64l.fi-: $(KERN_SRC) kernel/version.fs mach64l.fs machpc.fs $(FORTH_GEN0) +kernl64l.fi-: $(KERN_DEPS) mach64l.fs $(FORTHB) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" -kernl64b.fi-: $(KERN_SRC) kernel/version.fs mach64b.fs machpc.fs $(FORTH_GEN0) +kernl64b.fi-: $(KERN_DEPS) mach64b.fs $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" -kernl-%.fi: arch/%/mach.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) - $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" - if [ -f `echo $< | sed s/fs/sh/` ]; \ - then sh `echo $< | sed s/fs/sh/` $@; \ - else $(CP) $@- $@; \ - fi +#Solaris make does not like that: +@GNUMAKE@kernl-%.fi: arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) +@GNUMAKE@ $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" +@GNUMAKE@ if [ -f `echo $< | sed s/fs/sh/` ]; \ +@GNUMAKE@ then sh `echo $< | sed s/fs/sh/` $@; \ +@GNUMAKE@ else $(CP) $@- $@; \ +@GNUMAKE@ fi #SunOS make does not like that #arch/%/mach.fs: arch/%/prim.fs arch/%/asm.fs @@ -611,37 +712,23 @@ gforth.fi: $(kernel_fi) gforthmi gforth$ # ------------- Make c-engine -prim.b: prim peeprules.vmg - m4 -s $(srcdir)/prim >$@ - -engine/prim.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- +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 >$@ + sleep 1 #should make hpux-workaround unnecessary -engine/prim_lab.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-label dup process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- +$(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs + GFORTH="$(FORTHP)" $(srcdir)/gfgen -fast -engine/prim_superend.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-superend dup process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- - -engine/peephole.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' noop ' output-peephole process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- - -engine/profile.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-profile ' output-profile process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- +$(FORTH_GEN_ENGINE): prim.b prims2x.fs + GFORTH="$(FORTHP)" $(srcdir)/gfgen kernel/aliases.fs: prim.b prims2x.fs kernel/aliases0.fs $(CP) kernel/aliases0.fs $@- - $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias dup process-file bye" >>$@- + $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias ' noop process-file bye" >>$@- $(CP) $@- $@ $(RM) $@- @@ -651,20 +738,23 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- -kernel/peephole.fs: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' noop ' output-forth-peephole process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- - gforth$(EXE): engines -$(CP) gforth$(EXE) gforth~ $(CP) engine/$@ $@ @GFORTH_EXE@ -gforth-fast$(EXE): engines +gforth-fast$(EXE): engines-fast $(CP) engine/$@ $@ @GFORTHFAST_EXE@ +gforth-native$(EXE): engines-fast + $(CP) engine/$@ $@ +#@GFORTHX_EXE@ + +gforth-itc$(EXE): engines + $(CP) engine/$@ $@ + @GFORTHITC_EXE@ + gforth-ditc$(EXE): engines $(CP) engine/$@ $@ @GFORTHDITC_EXE@ @@ -672,8 +762,13 @@ gforth-ditc$(EXE): engines gforth-prof$(EXE): engines $(CP) engine/$@ $@ -engines: FORCE engine/Makefile engine/prim.i engine/prim_lab.i engine/peephole.i engine/profile.i - cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE) +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 @@ -693,7 +788,7 @@ tags: gforth.tags $(CP) gforth.tags $@ install.TAGS: gforth.TAGS - sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS + sed 's;^\$(srcdir)/;$(datadir)/gforth/$(VERSION)/;' gforth.TAGS >install.TAGS gforth.TAGS: @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS $(FORTHK) etags.fs except.fs startup.fs -e bye @@ -743,58 +838,78 @@ checkdoc: doc/gforth.ds prim.b ds2texi.f $(FORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye -grep unknown doc/gforth.texi -dvi: doc/gforth.dvi +dvi: doc/gforth.dvi doc/vmgen.dvi + +pdf: doc/gforth.pdf doc/vmgen.pdf doc/gforth.dvi doc/gforth.fns: $(GFORTH_TEXI) cd doc; $(TEXI2DVI) gforth.texi +doc/gforth.pdf: $(GFORTH_TEXI) + cd doc; $(TEXI2PDF) gforth.texi + +doc/vmgen.dvi: $(VMGEN_TEXI) + cd doc; $(TEXI2DVI) vmgen.texi + +doc/vmgen.pdf: $(VMGEN_TEXI) + cd doc; $(TEXI2PDF) vmgen.texi + doc/gforth.ps: doc/gforth.dvi $(DVI2PS) doc/gforth.dvi -o $@ -info: doc/gforth.info +doc/vmgen.ps: doc/vmgen.dvi + $(DVI2PS) doc/vmgen.dvi -o $@ -doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI) - -cd doc; $(MAKEINFO) gforth.texi +info: doc/gforth.info doc/vmgen.info -### need makeinfo 4.0 to generate html. Otherwise, use texi2html.. -html: $(GFORTH_TEXI) - -$(RMTREE) html - -mkdir html - cd html; $(MAKEINFO) --html -I ../doc ../doc/gforth.texi -### cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi +doc/gforth.info: $(GFORTH_TEXI) + cd doc; $(MAKEINFO) gforth.texi + +doc/vmgen.info: $(VMGEN_TEXI) + cd doc; $(MAKEINFO) vmgen.texi + + +### need makeinfo 4.2 to generate html with these rules +doc/gforth: $(GFORTH_TEXI) + cd doc; $(MAKEINFO) --html gforth.texi + +doc/vmgen: $(VMGEN_TEXI) + cd doc; $(MAKEINFO) --html vmgen.texi doc/gforth.txt: $(GFORTH_TEXI) -cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt -doc: info html doc/gforth.ps doc/gforth.txt TAGS +doc/vmgen.txt: $(VMGEN_TEXI) + -cd doc; $(MAKEINFO) --no-headers --no-split vmgen.texi >vmgen.txt + +doc: gforth.fi info doc/gforth doc/vmgen doc/gforth.ps doc/vmgen.ps doc/gforth.txt doc/vmgen.txt TAGS # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation. #Note: no target "$(srcdir)/configure", because that does not trigger #unless $(srcdir)!="." -configure: configure.in aclocal.m4 - cd $(srcdir) && autoconf +configure: configure.in aclocal.m4 + cd $(srcdir) && autoconf -aclocal.m4: acinclude.m4 configure.in +aclocal.m4: configure.in aclocal # autoheader might not change config.h.in, so touch a stamp file. -engine/config.h.in: stamp-h.in -stamp-h.in: configure.in acconfig.h - cd $(srcdir) && autoheader - echo timestamp > $(srcdir)/stamp-h.in - -engine/config.h: stamp-h -stamp-h: engine/config.h.in config.status - CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status - echo timestamp > stamp-h +engine/config.h.in: stamp-h.in +stamp-h.in: configure.in aclocal.m4 + cd $(srcdir) && autoheader + echo timestamp > $(srcdir)/stamp-h.in + +engine/config.h: stamp-h +stamp-h: engine/config.h.in config.status + ./config.status -Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in config.status - CONFIG_FILES="$@" CONFIG_HEADERS=engine/config.h ./config.status +Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in + ./config.status -config.status: configure - ./config.status --recheck +config.status: configure + ./config.status --recheck #create files for DOS, because DOS cannot do it itself