--- gforth/Makefile.in 2001/01/28 18:49:10 1.197 +++ gforth/Makefile.in 2001/03/01 14:27:22 1.202 @@ -69,7 +69,7 @@ ENGINE = ./gforth FORTH = $(ENGINE) $(FORTH_ARGS) ENGINE_FAST = $(ENGINE)-fast FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) -FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) +FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -m 1000000 -i $(kernel_fi) FORTHK = $(ENGINE) $(FORTHKFLAGS) FORTHP = $(ENGINE) --die-on-signal -i ./$(kernel_fi) #the "-2 image-included-files +!" undoes the change to image-included-files @@ -226,7 +226,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) tt.fs sokoban.fs \ unbuffer.fs wordsets.fs \ test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ - test/other.fs test/checkans.fs \ + test/string.fs test/other.fs test/checkans.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 \ @@ -330,10 +330,10 @@ SOURCES = $(CVSDIRS) compat Makefile.in RCS_FILES = ToDo model high-level -GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) kernel/version.fs +GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-prof$(EXE) kernel/version.fs # things that need a working forth system to be generated -FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i kernel/aliases.fs kernel/prim.fs +FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i engine/peephole.i engine/profile.i kernel/aliases.fs kernel/prim.fs FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi # this is used for antidependences, FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ @@ -403,7 +403,7 @@ docclean: FORCE clean: mostlyclean -$(RM) -rf $(GEN) engine/gforth$(EXE) \ - engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) \ + engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \ *.o engine/*.o arch/*/*.o version distclean: clean @@ -505,7 +505,7 @@ uninstall: FORCE @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforth-fast$(EXE) $(bindir)/gforthmi $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth" check test: gforth$(EXE) gforth.fi - $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye | diff -c - $(srcdir)/test/coretest.out + $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs -e bye | 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 $(FORTH) -m 100000 prims2x.fs -e \ @@ -603,6 +603,16 @@ engine/prim_lab.i: prim.b prims2x.fs $(CP) $@- $@ $(RM) $@- +engine/peephole.i: prim.b prims2x.fs + $(FORTH) -m 1000000 prims2x.fs -e "c-flag on s\" prim.b\" ' noop ' output-peephole process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- + +engine/profile.i: prim.b prims2x.fs + $(FORTH) -m 1000000 prims2x.fs -e "c-flag on s\" prim.b\" ' output-profile ' output-profile process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- + kernel/aliases.fs: prim.b prims2x.fs kernel/aliases0.fs $(CP) kernel/aliases0.fs $@- $(FORTH) -m 1000000 prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias dup process-file bye" >>$@- @@ -628,8 +638,11 @@ gforth-ditc$(EXE): engines $(CP) engine/$@ $@ @GFORTHDITC_EXE@ -engines: FORCE engine/Makefile engine/prim.i engine/prim_lab.i - cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE) +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) # ------------- additional C primitives