--- gforth/Makefile.in 2007/01/21 17:29:53 1.339 +++ gforth/Makefile.in 2007/03/18 21:49:02 1.346 @@ -58,6 +58,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@ @@ -251,7 +252,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) 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 \ + 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 xwords.fs \ @@ -259,10 +260,12 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) 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 \ 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 \ @@ -296,6 +299,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 \ @@ -395,7 +401,7 @@ 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 @@ -520,15 +526,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$@ @@ -542,15 +544,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 @@ -572,8 +570,10 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker -$(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) + -$(MASSAGE_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) + -$(MASSAGE_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)) @@ -588,7 +588,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"; \ @@ -644,7 +644,7 @@ check-nofast: gforth$(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 $$? @@ -656,25 +656,16 @@ 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 +onebench one-bench: + $(FORTH_FAST) onebench.fs + +all-bench allbench: gforth-fast$(EXE) gforth$(EXE) gforth-itc$(EXE) gforth-ditc$(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 @@ -777,14 +768,17 @@ kernel/prim.fs: prim.b prims2x.fs kernel gforth$(EXE): engines -$(CP) gforth$(EXE) gforth~ $(CP) engine/$@ $@ + -$(MASSAGE_EXE) $@ @GFORTH_EXE@ gforth-fast$(EXE): engines-fast $(CP) engine/$@ $@ + -$(MASSAGE_EXE) $@ @GFORTHFAST_EXE@ gforth-native$(EXE): engines-fast $(CP) engine/$@ $@ + -$(MASSAGE_EXE) $@ #@GFORTHX_EXE@ gforth-itc$(EXE): engines @@ -800,10 +794,10 @@ gforth-prof$(EXE): engines 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