--- gforth/Makefile.in 2001/05/13 10:54:10 1.209 +++ gforth/Makefile.in 2002/03/01 13:25:25 1.217 @@ -70,14 +70,14 @@ FORTH = $(ENGINE) $(FORTH_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 -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) +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) -m 1000000 -e 'fpath= .|~+|$(srcdir)' +FORTHB = $(BUILDFORTH) -e 'fpath= .|~+|$(srcdir)' # the Forth system for running prims2x.fs -FORTHP = $(FORTHB) startup.fs +FORTHP = $(FORTHB) ENGINE_FAST = $(ENGINE)-fast FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) -FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -m 1000000 -i $(kernel_fi) +FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -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 @@ -352,7 +352,8 @@ RCS_FILES = ToDo model high-level 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 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/peephole.i engine/profile.i +FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi # this is used for antidependences, FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ @@ -529,7 +530,7 @@ 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 $(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 \ + $(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 @@ -537,7 +538,7 @@ bench: gforth-fast$(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) --dictionary-size 1M matrix.fs -e "main bye" + time $(FORTH_FAST) matrix.fs -e "main bye" time $(FORTH_FAST) fib.fs -e "main bye" # ------------- Make forth images @@ -606,7 +607,7 @@ kernl64l.fi: $(KERNLS) # -$(CP) $@ $@~ # -$(CP) $< $@ -gforth.fi: $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC) +gforth.fi: $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(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 @@ -624,13 +625,23 @@ engine/prim_lab.i: prim.b prims2x.fs $(CP) $@- $@ $(RM) $@- +engine/prim_names.i: prim.b prims2x.fs + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-forthname dup process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- + +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" >$@- + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-profile ' output-profile-combined process-file bye" >$@- $(CP) $@- $@ $(RM) $@- @@ -667,7 +678,7 @@ 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 +engines: FORCE $(FORTH_GEN_ENGINE) engine/Makefile cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE) # ------------- additional C primitives @@ -684,6 +695,9 @@ engines: FORCE engine/Makefile engine/pr TAGS: gforth.TAGS $(CP) gforth.TAGS $@ +tags: gforth.tags + $(CP) gforth.tags $@ + install.TAGS: gforth.TAGS sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS @@ -692,6 +706,11 @@ gforth.TAGS: @kernel_fi@ gforth$(EXE) $( cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS rm TAGS +gforth.tags: @kernel_fi@ gforth$(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 + prim.TAGS: prim.b prims2x.fs #echo '2c\' >prim.TAGS.sed #echo $(srcdir)/prim >>prim.TAGS.sed @@ -700,9 +719,20 @@ prim.TAGS: prim.b prims2x.fs $(CP) $@- $@ $(RM) $@- +prim.tags: prim.b prims2x.fs + #echo '2c\' >prim.TAGS.sed + #echo $(srcdir)/prim >>prim.TAGS.sed + #$(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@- + $(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-vi-tag dup process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- + kernel.TAGS: rm kernl16l.fi-; $(MAKE) @kernel_fi@ +kernel.tags: + rm kernl16l.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 @@ -716,7 +746,7 @@ doc/gforth.texi: doc/gforth.ds prim.b ds $(RM) $@- checkdoc: doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi - $(FORTH) -m 1M ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye + $(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