--- gforth/Makefile.in 2002/12/08 09:57:53 1.232 +++ gforth/Makefile.in 2003/02/03 08:59:29 1.254 @@ -30,14 +30,14 @@ # ------------- gforth version -VERSION = @VERSION@ +VERSION = @PACKAGE_VERSION@ DOSVERSION=`echo $(VERSION)|sed 's/\.//g'|sed 's/-.*//g'` # ------------- System specific variables machine=@machine@ kernel_fi=@kernel_fi@ -EXE=@EXE@ +EXE=@EXEEXT@ # this is the type of machine # used to extend the include path with ./arch/$machine @@ -74,7 +74,7 @@ FORTHS = $(ENGINE) $(FORTHS_ARGS) # possible to override this variable at the command line for an initial build (jaw) 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) -e 'fpath= .|~+|$(srcdir)' +FORTHB = $(BUILDFORTH) -e 'fpath= .|~+|$(srcdir)' except.fs # the Forth system for running prims2x.fs FORTHP = $(FORTH) ENGINE_FAST = $(ENGINE)-fast @@ -170,7 +170,8 @@ KERN_SRC = \ kernel/saccept.fs \ kernel/doers.fs \ kernel/getdoers.fs \ - kernel/pass.fs + kernel/pass.fs \ + kernel/groups.fs EC_SRC = \ asm/README \ @@ -192,6 +193,7 @@ GFORTH_FI_SRC = \ blocked.fb \ blocks.fs \ bufio.fs \ + code.fs \ debug.fs \ debugs.fs \ ekey.fs \ @@ -228,7 +230,7 @@ GFORTH_FI_SRC = \ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ ans-report.fs ansi.fs answords.fs \ - code.fs colorize.fs comp-i.fs \ + colorize.fs comp-i.fs \ doskey.fs ds2texi.fs \ envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \ glosgen.fs gray.fs httpd.fs proxy.fs \ @@ -238,7 +240,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/string.fs test/float.fs \ + test/string.fs test/float.fs test/gforth.fs \ test/other.fs test/signals.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 \ @@ -333,15 +335,16 @@ VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen- SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \ gforthmi.in vmgen.in README.vmgen NEWS.vmgen \ configure.in configure config.sub config.guess elisp-comp missing \ - acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \ + engine/config.h.in stamp-h.in \ iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \ COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \ doc/vmgen.texi doc/fdl.texi \ gforth.el \ prim peeprules.vmg engine/engine.c engine/main.c \ - engine/io.c engine/memcmpc.c engine/signals.c $(ARCHS) \ - engine/peephole.c engine/profile.c \ + engine/io.c engine/support.c engine/signals.c \ + $(ARCHS) \ + engine/profile.c \ engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \ engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \ engine/ansidecl.h engine/memmove.c \ @@ -359,13 +362,14 @@ SOURCES = $(CVSDIRS) compat Makefile.in RCS_FILES = ToDo model high-level -GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-native$(EXE) gforth-itc$(EXE) gforth-prof$(EXE) kernel/version.fs +GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) kernel/version.fs +#gforth-native$(EXE) gforth-prof$(EXE) # 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/peephole.i engine/profile.i \ - engine/prim_num.i -FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs + engine/prim_superend.i engine/profile.i \ + engine/prim_num.i engine/prim_grp.i +FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs kernel/groups.fs FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi # this is used for antidependences, FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ @@ -500,10 +504,13 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker touch $(siteforthdir)/siteinit.fs -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi $(bindir)/vmgen -$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) + -$(RM) $(bindir)/gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE)) $(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE)) + $(INSTALL_PROGRAM) -s gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) + (cd $(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE)) $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION) $(INSTALL_PROGRAM) vmgen $(bindir)/vmgen-$(VERSION) $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION) @@ -542,17 +549,26 @@ installdirs: mkinstalldirs #deinstall all files specific to this version of gforth #to uninstall version foo, type `make uninstall VERSION=foo' uninstall: FORCE - -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION) (bindir)/vmgen-$(VERSION) - @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforth-fast$(EXE) $(bindir)/gforthmi $(bindir)/vmgen $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth" + -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION) (bindir)/vmgen-$(VERSION) + @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-itc$(EXE) $(bindir)/gforthmi $(bindir)/vmgen $(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 test/string.fs test/float.fs -e bye | diff -c - $(srcdir)/test/coretest.out +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 ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1 + $(MAKE) checkone 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 -e bye | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out $(FORTH) test/other.fs -e bye $(FORTHS) test/signals.fs -e bye - $(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.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"| \ - diff -c - $(srcdir)/engine/prim.i + tr -d '\015' | diff -c - $(srcdir)/engine/prim.i bench: gforth-fast$(EXE) gforth.fi @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)' @@ -561,6 +577,26 @@ 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 + # ------------- Make forth images # How to make new images: @@ -589,12 +625,13 @@ kernl64l.fi-: $(KERN_DEPS) mach64l.fs kernl64b.fi-: $(KERN_DEPS) mach64b.fs $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" -kernl-%.fi: arch/%/mach.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) - $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" - if [ -f `echo $< | sed s/fs/sh/` ]; \ - then sh `echo $< | sed s/fs/sh/` $@; \ - else $(CP) $@- $@; \ - fi +#Solaris make does not like that: +#kernl-%.fi: arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) +# $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" +# if [ -f `echo $< | sed s/fs/sh/` ]; \ +# then sh `echo $< | sed s/fs/sh/` $@; \ +# else $(CP) $@- $@; \ +# fi #SunOS make does not like that #arch/%/mach.fs: arch/%/prim.fs arch/%/asm.fs @@ -636,7 +673,7 @@ prim.b: prim peeprules.vmg m4 -s $(srcdir)/prim >$@ engine/prim.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.i\" out-filename 2! s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@- + $(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) $@- @@ -645,6 +682,11 @@ engine/prim_lab.i: prim.b prims2x.fs $(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) $@- $@ @@ -682,6 +724,9 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- +kernel/groups.fs: engine/prim_grp.i + grep GROUP engine/prim_grp.i | cut -f2 -d, | sed -e 's/)/ ,/g' >$@ + 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" >$@ @@ -709,10 +754,10 @@ gforth-ditc$(EXE): engines gforth-prof$(EXE): engines $(CP) engine/$@ $@ -gforths: gforth$(EXE) gforth-fast$(EXE) gforth-native$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE) +gforths: gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE) engines: FORCE $(FORTH_GEN_ENGINE) engine/Makefile - cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-native$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE) + cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE) # ------------- additional C primitives @@ -825,28 +870,27 @@ doc: info doc/gforth doc/vmgen doc/gfor #Note: no target "$(srcdir)/configure", because that does not trigger #unless $(srcdir)!="." -configure: configure.in aclocal.m4 - cd $(srcdir) && autoconf +configure: configure.in aclocal.m4 + cd $(srcdir) && autoconf -aclocal.m4: acinclude.m4 configure.in +aclocal.m4: configure.in aclocal # autoheader might not change config.h.in, so touch a stamp file. -engine/config.h.in: stamp-h.in -stamp-h.in: configure.in acconfig.h - cd $(srcdir) && autoheader - echo timestamp > $(srcdir)/stamp-h.in - -engine/config.h: stamp-h -stamp-h: engine/config.h.in config.status - CONFIG_FILES=$@ CONFIG_HEADERS="engine/config.h" ./config.status - echo timestamp > stamp-h +engine/config.h.in: stamp-h.in +stamp-h.in: configure.in aclocal.m4 + cd $(srcdir) && autoheader + echo timestamp > $(srcdir)/stamp-h.in + +engine/config.h: stamp-h +stamp-h: engine/config.h.in config.status + ./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 - CONFIG_FILES="$@" CONFIG_HEADERS="engine/config.h" ./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 + ./config.status -config.status: configure - ./config.status --recheck +config.status: configure + ./config.status --recheck #create files for DOS, because DOS cannot do it itself