--- gforth/Makefile.in 2003/09/20 06:04:01 1.283 +++ gforth/Makefile.in 2003/11/06 09:47:49 1.288 @@ -341,7 +341,7 @@ VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefil VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-ex2/%) SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \ - gforthmi.in vmgen.in README.vmgen NEWS.vmgen \ + 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 \ iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \ @@ -350,7 +350,8 @@ SOURCES = $(CVSDIRS) compat Makefile.in 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 \ + 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 \ @@ -372,15 +373,22 @@ SOURCES = $(CVSDIRS) compat Makefile.in RCS_FILES = ToDo model high-level -ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) $(PROFEXES) #gforth-native$(EXE) +ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-itc$(EXE) $(PROFEXES) -GEN = $(ENGINES) kernel/version.fs +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_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 @@ -597,6 +605,10 @@ checkone test: gforth$(EXE) gforth.fi "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" + + 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" @@ -696,54 +708,19 @@ gforth.fi: $(kernel_fi) gforthmi gforth$ # ------------- Make c-engine -prim.b: prim peeprules.vmg +prim.b: prim cache0.vmg m4 -s $(srcdir)/prim >$@ sleep 1 #should make hpux-workaround unnecessary -engine/prim.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.i\" save-mem out-filename 2! s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- - -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) $@- - -engine/prim_grp.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' noop dup process-file bye" >$@- - $(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-combined process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- +prim-fast.b: prim cache1.vmg peeprules.vmg + m4 -DM4_ENGINE_FAST -s $(srcdir)/prim >$@ + sleep 1 #should make hpux-workaround unnecessary -engine/super2.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-super2 dup process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- +$(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs + GFORTH="$(FORTHP)" gfgen -fast -engine/costs.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs-gforth-simple ' output-costs-gforth-combined process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- +$(FORTH_GEN_ENGINE): prim.b prims2x.fs + GFORTH="$(FORTHP)" gfgen kernel/aliases.fs: prim.b prims2x.fs kernel/aliases0.fs $(CP) kernel/aliases0.fs $@- @@ -757,19 +734,16 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- -engine/prim_num.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c-prim-num ' noop process-file bye" >$@ - 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 +gforth-native$(EXE): engines-fast $(CP) engine/$@ $@ #@GFORTHX_EXE@ @@ -784,11 +758,14 @@ gforth-ditc$(EXE): engines gforth-prof$(EXE): engines $(CP) engine/$@ $@ -gforths: $(ENGINES) +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 %.c: %.pri prim2cl.fs @@ -924,7 +901,7 @@ engine/config.h: stamp-h stamp-h: engine/config.h.in config.status ./config.status -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: 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