--- gforth/Makefile.in 2006/03/11 21:50:58 1.317 +++ gforth/Makefile.in 2007/06/01 18:40:20 1.349 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc. #This file is part of Gforth. @@ -48,6 +48,8 @@ PATHSEP = @PATHSEP@ osclass = @OSCLASS@ +EC = @EC@ + # ------------- Utility programs SHELL = /bin/sh @@ -58,6 +60,7 @@ MV = mv TAR = tar cf - INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s +MASSAGE_EXE = @MASSAGE_EXE@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_INFO = @INSTALL_INFO@ @@ -88,8 +91,8 @@ FORTHK = $(ENGINE) $(FORTHKFLAGS) # in exboot.fs STARTUP = exboot.fs startup.fs @asm_fs@ @disasm_fs@ STRIP = strip -TEXI2DVI = texi2dvi -e -TEXI2PDF = texi2dvi --pdf -e +TEXI2DVI = @TEXI2DVI@ +TEXI2PDF = @TEXI2DVI@ --pdf DVI2PS = dvips -t letterSize -Z #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/ MAKEINFO = makeinfo @@ -142,7 +145,7 @@ CVSDIRS = CVS engine/CVS kernel/CVS doc/ arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS arch/amd64/CVS \ arch/arm/CVS arch/r8c/CVS -INCLUDES = engine/forth.h engine/threaded.h engine/io.h +INCLUDES = engine/forth.h engine/threaded.h engine/io.h engine/longlong.h KERN_SRC = \ mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ @@ -150,7 +153,6 @@ KERN_SRC = \ kernel/aliases0.fs \ kernel/aliases.fs \ kernel/args.fs \ - chains.fs \ kernel/cbr.fs \ kernel/cloop.fs \ kernel/cond.fs \ @@ -186,6 +188,7 @@ EC_SRC = \ asm/README \ asm/bitmask.fs \ asm/numref.fs \ + chains.fs \ asm/basic.fs \ asm/generic.fs \ asm/target.fs \ @@ -194,7 +197,8 @@ EC_SRC = \ ec/shex.fs \ ec/builttag.fs \ ec/dotx.fs \ - ec/nesting.fs + ec/nesting.fs \ + build-ec.in GFORTH_FI_SRC = \ assert.fs \ @@ -203,11 +207,11 @@ GFORTH_FI_SRC = \ blocks.fs \ bufio.fs \ code.fs \ - complex.fs \ debug.fs \ debugs.fs \ dis-gdb.fs \ ekey.fs \ + envos.fs \ savesys.fs \ environ.fs \ errors.fs \ @@ -215,11 +219,11 @@ GFORTH_FI_SRC = \ except.fs \ extend.fs \ float.fs \ - fft.fs \ glocals.fs \ hash.fs \ history.fs \ intcomp.fs \ + libcc.fs \ locals.fs \ look.fs \ quotes.fs \ @@ -241,27 +245,30 @@ GFORTH_FI_SRC = \ 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 + arch/mips/testasm.fs arch/mips/testdisasm.fs \ + arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ ans-report.fs ansi.fs answords.fs \ - colorize.fs comp-i.fs \ + colorize.fs comp-i.fs complex.fs \ depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \ - envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \ + envos.dos envos.os2 etags.fs fft.fs filedump.fs fi2c.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 \ + locate.fs more.fs onebench.fs other.fs prims2x.fs random.fs \ + regexp.fs sokoban.fs string.fs table.fs tags.fs \ tt.fs \ - unbuffer.fs wordsets.fs \ + unbuffer.fs wordsets.fs xwords.fs \ 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 test/deferred.fs \ + test/coremore.fs test/gforth-nofast.fs test/libcc.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 libffi.fs sieve.fs unix/socket.fs + add.fs lib.fs oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs \ + endtry-iferror.fs recover-endtry.fs COMPAT = compat/README \ compat/anslocal.fs \ @@ -295,6 +302,9 @@ ARCHS = \ arch/power/_sync_cache_range.c \ arch/alpha/machine.h \ arch/arm/machine.h \ + arch/arm/cacheflush0.c \ + arch/arm/cacheflush1.c \ + arch/arm/cacheflush2.c \ arch/ia64/machine.h \ arch/ia64/flush_icache_block.c \ arch/amd64/machine.h \ @@ -331,6 +341,11 @@ ARCHS = \ arch/r8c/asm.fs \ arch/r8c/asm-test.fs \ arch/r8c/prim.fs \ + arch/r8c/errors.fs \ + arch/r8c/tt.fs \ + arch/r8c/tasker.fs \ + arch/r8c/lauflicht.fs \ + arch/r8c/terminal.fs \ arch/r8c/mach.fs #not included in distribution until distribution terms are included: @@ -363,7 +378,7 @@ VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen- SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \ gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \ configure.in configure config.sub config.guess elisp-comp missing \ - engine/config.h.in stamp-h.in \ + engine/config.h.in stamp-h.in envos.fs.in \ iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \ BUILD-FROM-SCRATCH model \ COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ @@ -389,14 +404,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 test/gforth.out \ cache-fast*.vmg RCS_FILES = ToDo model high-level -ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-itc$(EXE) $(PROFEXES) +ENGINES = gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES) -ENGINES_FAST = gforth-fast$(EXE) #gforth-native$(EXE) +ENGINES_FAST = gforth-fast$(EC)$(EXE) #gforth-native$(EXE) GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs @@ -414,18 +429,18 @@ FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) ke 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@ +FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec #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 \ - doc/vmgen.info doc/vmgen.info* doc/vmgen.ps +DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \ + doc/vmgen.info doc/vmgen.ps -KERNLS = kernl16b.fi- kernl16l.fi- \ - kernl32b.fi- kernl32l.fi- \ - kernl64b.fi- kernl64l.fi- +KERNLS = kernl16b$(EC).fi- kernl16l$(EC).fi- \ + kernl32b$(EC).fi- kernl32l$(EC).fi- \ + kernl64b$(EC).fi- kernl64l$(EC).fi- GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \ doc/gforth.texi doc/gforth.dvi doc/gforth.ps \ @@ -452,7 +467,6 @@ version: Makefile.in configure.in # shell und file utilities. kernel/version.fs: version - $(MAKE) gforth$(EXE) echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs more: engines $(FORTH_GEN) $(GEN) @@ -490,9 +504,9 @@ docclean: FORCE clean: mostlyclean -$(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) + engine/gforth$(EC)$(EXE) engine/gforth-fast$(EC)$(EXE) \ + engine/gforth-native$(EC)$(EXE) engine/gforth-itc$(EC)$(EXE) \ + engine/gforth-ditc$(EC)$(EXE) engine/gforth-prof$(EC)$(EXE) distclean: clean -$(RM) -rf config.cache config.log config.status \ @@ -514,15 +528,11 @@ virtualclean: mostlyclean #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 machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' -e 's/@[L]IBFFIFLAG@/false/g' machpc.fs +dist: Makedist FORCE $(MAKE) -f Makedist d$@ - -$(RM) machpc.fs -dosdist: Makedist machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs +dosdist: Makedist FORCE $(MAKE) -f Makedist d$@ - -$(RM) machpc.fs srcdist: Makedist FORCE $(MAKE) -f Makedist d$@ @@ -536,15 +546,11 @@ docdist: Makedist FORCE htmldist: Makedist FORCE $(MAKE) -f Makedist d$@ -bindist: Makedist machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs +bindist: Makedist FORCE $(MAKE) -f Makedist d$@ - -$(RM) machpc.fs -binonlydist: Makedist machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs +binonlydist: Makedist FORCE $(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 @@ -559,17 +565,20 @@ hpux-workaround: #hard to generate). #we rebuild gforth.fi, because it contains some path names. #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership. -install: gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs +install: gforth$(EC)$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs + $(NORMAL_INSTALL) touch $(DESTDIR)$(siteforthdir)/siteinit.fs - -$(RM) $(DESTDIR)$(bindir)/gforth$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen - -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) - -$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE) - $(INSTALL_PROGRAM) gforth$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) - (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE)) - $(INSTALL_PROGRAM) gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) - (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE)) - $(INSTALL_PROGRAM) gforth-itc$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE) - (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE)) + -$(RM) $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen + -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) + -$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) + $(INSTALL_PROGRAM) gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) + -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-$(VERSION)$(EC)$(EXE) gforth$(EC)$(EXE)) + $(INSTALL_PROGRAM) gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) + -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EC)$(EXE) gforth-fast$(EC)$(EXE)) + $(INSTALL_PROGRAM) gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EC)$(EXE) gforth-itc$(EC)$(EXE)) $(INSTALL_SCRIPT) gforthmi $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(INSTALL_SCRIPT) vmgen $(DESTDIR)$(bindir)/vmgen-$(VERSION) $(INSTALL_PROGRAM) gforth-ditc $(DESTDIR)$(libdir)/gforth/$(VERSION) @@ -581,7 +590,7 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \ done $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION) - @if test -d "$(emacssitelispdir)"; then \ + @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \ $(INSTALL_DATA) $(srcdir)/gforth.el $(DESTDIR)$(emacssitelispdir); \ else \ echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ @@ -591,12 +600,14 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS $(RM) gforth.fi install.TAGS + $(POST_INSTALL) $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info install-strip: install installdirs: mkinstalldirs + $(NORMAL_INSTALL) for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir); do \ $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \ done @@ -608,59 +619,55 @@ installdirs: mkinstalldirs #deinstall all files specific to this version of gforth #to uninstall version foo, type `make uninstall VERSION=foo' uninstall: FORCE - -$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)(bindir)/vmgen-$(VERSION) - @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth" + $(NORMAL_UNINSTALL) + -$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)(bindir)/vmgen-$(VERSION) + @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(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 check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 + $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1 + $(MAKE) checkone check-nofast 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 check-nofast ENGINE="./gforth" >/dev/null 2>&1 $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1 @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 test/coreext.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out +checkone test: gforth$(EC)$(EXE) gforth.fi + $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out $(FORTH) test/other.fs -e bye $(FORTHS) test/signals.fs -e bye + $(FORTHS) test/coremore.fs test/gforth.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out $(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\" 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 +check-nofast: gforth$(EC)$(EXE) gforth.fi + $(FORTHS) test/gforth-nofast.fs -e bye + 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" + $(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 +bench: gforth-fast$(EC)$(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" time $(FORTH_FAST) bubble.fs -e "main bye" 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 +onebench one-bench: + $(FORTH_FAST) onebench.fs + +all-bench allbench: gforth-fast$(EC)$(EXE) gforth$(EC)$(EXE) gforth-itc$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth.fi + ./gforth-fast --dynamic onebench.fs + ./gforth-fast --no-dynamic onebench.fs + ./gforth --dynamic onebench.fs + ./gforth --no-dynamic onebench.fs + ./gforth-itc onebench.fs + ./gforth-ditc onebench.fs # ------------- Make forth images @@ -672,23 +679,23 @@ all-bench: gforth-fast$(EXE) gforth$(EXE # 3. copy new kernels to kernlXYZ.fi # these are the ones we want to use now -kernl16l.fi-: $(KERN_DEPS) mach16l.fs - $(FORTHB) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" +kernl16l$(EC).fi-: $(KERN_DEPS) mach16l.fs + $(FORTHB) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l$(EC).fi- $(bindir)/gforth-$(VERSION) bye" -kernl16b.fi-: $(KERN_DEPS) mach16b.fs - $(FORTHB) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" +kernl16b$(EC).fi-: $(KERN_DEPS) mach16b.fs + $(FORTHB) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b$(EC).fi- $(bindir)/gforth-$(VERSION) bye" -kernl32l.fi-: $(KERN_DEPS) mach32l.fs - $(FORTHB) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" +kernl32l$(EC).fi-: $(KERN_DEPS) mach32l.fs + $(FORTHB) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l$(EC).fi- $(bindir)/gforth-$(VERSION) bye" -kernl32b.fi-: $(KERN_DEPS) mach32b.fs - $(FORTHB) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" +kernl32b$(EC).fi-: $(KERN_DEPS) mach32b.fs + $(FORTHB) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b$(EC).fi- $(bindir)/gforth-$(VERSION) bye" -kernl64l.fi-: $(KERN_DEPS) mach64l.fs - $(FORTHB) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" +kernl64l$(EC).fi-: $(KERN_DEPS) mach64l.fs + $(FORTHB) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l$(EC).fi- $(bindir)/gforth-$(VERSION) bye" -kernl64b.fi-: $(KERN_DEPS) mach64b.fs - $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" +kernl64b$(EC).fi-: $(KERN_DEPS) mach64b.fs + $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b$(EC).fi- $(bindir)/gforth-$(VERSION) bye" #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) @@ -701,35 +708,35 @@ kernl64b.fi-: $(KERN_DEPS) mach64b.fs #SunOS make does not like that #arch/%/mach.fs: arch/%/prim.fs arch/%/asm.fs -kernl16b.fi: $(KERNLS) - -$(CP) kernl16b.fi kernl16b.fi~ - -$(CP) kernl16b.fi- kernl16b.fi - -kernl16l.fi: $(KERNLS) - -$(CP) kernl16l.fi kernl16l.fi~ - -$(CP) kernl16l.fi- kernl16l.fi - -kernl32b.fi: $(KERNLS) - -$(CP) kernl32b.fi kernl32b.fi~ - -$(CP) kernl32b.fi- kernl32b.fi - -kernl32l.fi: $(KERNLS) - -$(CP) kernl32l.fi kernl32l.fi~ - -$(CP) kernl32l.fi- kernl32l.fi - -kernl64b.fi: $(KERNLS) - -$(CP) kernl64b.fi kernl64b.fi~ - -$(CP) kernl64b.fi- kernl64b.fi - -kernl64l.fi: $(KERNLS) - -$(CP) kernl64l.fi kernl64l.fi~ - -$(CP) kernl64l.fi- kernl64l.fi +kernl16b$(EC).fi: $(KERNLS) + -$(CP) kernl16b$(EC).fi kernl16b$(EC).fi~ + -$(CP) kernl16b$(EC).fi- kernl16b$(EC).fi + +kernl16l$(EC).fi: $(KERNLS) + -$(CP) kernl16l$(EC).fi kernl16l$(EC).fi~ + -$(CP) kernl16l$(EC).fi- kernl16l$(EC).fi + +kernl32b$(EC).fi: $(KERNLS) + -$(CP) kernl32b$(EC).fi kernl32b$(EC).fi~ + -$(CP) kernl32b$(EC).fi- kernl32b$(EC).fi + +kernl32l$(EC).fi: $(KERNLS) + -$(CP) kernl32l$(EC).fi kernl32l$(EC).fi~ + -$(CP) kernl32l$(EC).fi- kernl32l$(EC).fi + +kernl64b$(EC).fi: $(KERNLS) + -$(CP) kernl64b$(EC).fi kernl64b$(EC).fi~ + -$(CP) kernl64b$(EC).fi- kernl64b$(EC).fi + +kernl64l$(EC).fi: $(KERNLS) + -$(CP) kernl64l$(EC).fi kernl64l$(EC).fi~ + -$(CP) kernl64l$(EC).fi- kernl64l$(EC).fi #kernl%.fi: kernl%.fi- $(KERNLS) # -$(CP) $@ $@~ # -$(CP) $< $@ -gforth.fi: $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC) comp-i.fs +gforth.fi: $(kernel_fi) gforthmi gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP) # ------------- Make c-engine @@ -760,36 +767,39 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- -gforth$(EXE): engines - -$(CP) gforth$(EXE) gforth~ +gforth$(EC)$(EXE): engines + -$(CP) gforth$(EC)$(EXE) gforth~ $(CP) engine/$@ $@ + -$(MASSAGE_EXE) $@ @GFORTH_EXE@ -gforth-fast$(EXE): engines-fast +gforth-fast$(EC)$(EXE): engines-fast $(CP) engine/$@ $@ + -$(MASSAGE_EXE) $@ @GFORTHFAST_EXE@ -gforth-native$(EXE): engines-fast +gforth-native$(EC)$(EXE): engines-fast $(CP) engine/$@ $@ + -$(MASSAGE_EXE) $@ #@GFORTHX_EXE@ -gforth-itc$(EXE): engines +gforth-itc$(EC)$(EXE): engines $(CP) engine/$@ $@ @GFORTHITC_EXE@ -gforth-ditc$(EXE): engines +gforth-ditc$(EC)$(EXE): engines $(CP) engine/$@ $@ @GFORTHDITC_EXE@ -gforth-prof$(EXE): engines +gforth-prof$(EC)$(EXE): engines $(CP) engine/$@ $@ gforths: $(ENGINES) $(ENGINES_FAST) -engines: FORCE $(FORTH_GEN_ENGINE) engine/Makefile +engines: FORCE $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h cd engine && $(MAKE) $(ENGINES) -engines-fast: FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile +engines-fast: FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile engine/config.h cd engine && $(MAKE) $(ENGINES_FAST) # ------------- additional C primitives @@ -812,12 +822,12 @@ tags: gforth.tags install.TAGS: gforth.TAGS sed 's;^\$(srcdir)/;$(datadir)/gforth/$(VERSION)/;' gforth.TAGS >install.TAGS -gforth.TAGS: @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS +gforth.TAGS: @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS $(FORTHK) etags.fs except.fs startup.fs -e bye cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS rm TAGS -gforth.tags: @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.tags kernel.tags +gforth.tags: @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.tags kernel.tags $(FORTHK) tags.fs except.fs startup.fs -e bye cat tags prim.tags kernel.tags >gforth.tags rm tags @@ -839,10 +849,10 @@ prim.tags: prim.b prims2x.fs $(RM) $@- kernel.TAGS: - rm kernl16l.fi-; $(MAKE) @kernel_fi@ + rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@ kernel.tags: - rm kernl16l.fi-; $(MAKE) @kernel_fi@ + rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@ doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye @@ -927,13 +937,12 @@ engine/config.h: stamp-h stamp-h: engine/config.h.in config.status stamp-h.in ./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 +Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi envos.fs build-ec: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in ./config.status config.status: configure ./config.status --recheck - #create files for DOS, because DOS cannot do it itself makefile.dos: mkdosmf.sed Makefile.in engine/Makefile.in sed -f mkdosmf.sed makefile.dos