--- gforth/Makefile.in 2008/01/01 13:39:13 1.373 +++ gforth/Makefile.in 2008/01/14 17:23:24 1.382 @@ -72,7 +72,7 @@ FORTHPATH = .$(PATHSEP)$(libdir)/gforth/ FORTHSIZES = @FORTHSIZES@ FORTHS_ARGS = -p "$(FORTHPATH)$(PATHSEP)$(srcdir)" FORTH_ARGS = --die-on-signal $(FORTHS_ARGS) -ENGINE = ./gforth +ENGINE = ./gforth$(OPT) FORTH = $(ENGINE) $(FORTH_ARGS) FORTHS = $(ENGINE) $(FORTHS_ARGS) # the (existing) forth system to use for cross compiling and primitives tables @@ -83,7 +83,7 @@ BUILDFORTH = $(ENGINE) --die-on-signal - FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)' # the Forth system for running prims2x.fs FORTHP = $(FORTH) -ENGINE_FAST = $(ENGINE)-fast +ENGINE_FAST = ./gforth-fast$(OPT) FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) FORTHK = $(ENGINE) $(FORTHKFLAGS) @@ -103,7 +103,7 @@ TEXI2HTML = texi2html XCFLAGS = @CFLAGS@ XDEFINES = @DEFS@ -SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions +SWITCHES = $(XCFLAGS) $(XDEFINES) $(OPTDEFINES) #-DNDEBUG #turn off assertions ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves DEBUGFLAG = @DEBUGFLAG@ CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH='"$(FORTHPATH)"' @@ -113,6 +113,7 @@ XLDFLAGS = @LDFLAGS@ LDFLAGS = $(DEBUGFLAG) $(XLDFLAGS) LDLIBS = @LIBS@ +STACK_CACHE_REGS = @STACK_CACHE_REGS@ STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@ # ------------ Install Directories @@ -381,20 +382,9 @@ 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 gfgen README.vmgen NEWS.vmgen \ - configure.in configure config.sub config.guess elisp-comp missing \ - engine/config.h.in stamp-h.in envos.fs.in \ - iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \ - BUILD-FROM-SCRATCH model \ - COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ - doc/gforth.ds doc/gforth.1 doc/version.texi.in \ - doc/vmgen.texi doc/fdl.texi doc/gpl.texi \ - gforth.el \ - prim cache0.vmg cache1.vmg peeprules.vmg \ +ENGINE_SOURCES = engine/Makefile.in engine/config.h.in \ engine/engine.c engine/main.c \ engine/io.c engine/support.c engine/signals.c engine/libcc.h.in \ - $(ARCHS) \ engine/profile.c \ engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \ engine/ecvt.c engine/memcmp.c engine/rint.c \ @@ -403,10 +393,23 @@ SOURCES = $(CVSDIRS) compat Makefile.in engine/pow10.c engine/atanh.c engine/cleanalign.c \ engine/strerror.c engine/strsignal.c engine/dblsub.c \ engine/fnmatch.h engine/fnmatch.c \ - INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \ + engine/makefile.dos engine/makefile.os2 + +SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \ + gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \ + configure.in configure config.sub config.guess elisp-comp missing \ + stamp-h.in envos.fs.in \ + iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \ + BUILD-FROM-SCRATCH model \ + COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ + doc/gforth.ds doc/gforth.1 doc/version.texi.in \ + doc/vmgen.texi doc/fdl.texi doc/gpl.texi \ + gforth.el \ + $(ARCHS) \ + INSTALL.DOS makefile.dos mkdosmf.sed config.bat \ dosconf.h gforthmi.bat mkinstalldirs siteinit.fs \ versions.bsh \ - configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \ + configure.cmd mkos2mf.sed os2conf.h makefile.os2 \ gforthmi.cmd glosgen.glo doc/glossaries.doc \ $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \ timings.sc \ @@ -415,9 +418,9 @@ SOURCES = $(CVSDIRS) compat Makefile.in RCS_FILES = ToDo model high-level -ENGINES = gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES) +ENGINES = gforth$(OPT)$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES) -ENGINES_FAST = gforth-fast$(EC)$(EXE) #gforth-native$(EXE) +ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc @@ -438,7 +441,7 @@ FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gfor FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec #kernel dependencies -KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs gforth$(EXE) +KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs gforth$(OPT)$(EXE) #distributed documentation DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \ @@ -461,8 +464,7 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \ .SUFFIXES: .SUFFIXES: .c .o - -all: kernel/version.fs more +all: kernel/version.fs more # use this dependency for phony targets just as mostlyclean,... FORCE: ; @@ -479,7 +481,7 @@ version: Makefile.in configure.in kernel/version.fs: version echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs -more: engines $(FORTH_GEN) $(GEN) +more: $(ENGINES) $(FORTH_GEN) $(GEN) @make check @$(FORTH_FAST) --diag -e bye @@ -513,11 +515,12 @@ docclean: FORCE doc/gforth.toc doc/gforth.tp doc/gforth.vr html clean: mostlyclean - -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \ - engine/gforth$(EC)$(EXE) engine/gforth-fast$(EC)$(EXE) \ - engine/gforth-native$(EC)$(EXE) engine/gforth-itc$(EC)$(EXE) \ - engine/gforth-ditc$(EC)$(EXE) engine/gforth-prof$(EC)$(EXE) \ - engine/prim-s.i + -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \ + gforth-itc-noll$(EC)$(EXE) engine/gforth-itc-noll$(EC)$(EXE) \ + gforth-ditc-noll$(EC)$(EXE) engine/gforth-ditc-noll$(EC)$(EXE) \ + gforth-prof-noll$(EC)$(EXE) engine/gforth-prof-noll$(EC)$(EXE) \ + engine/prim-s.i + for i in gforth gforth-fast gforth-native; do for j in $(OPTS); do rm -f engine/$$i$${j}$(EC)$(EXE) $$i$${j}$(EC)$(EXE); done; done distclean: clean -$(RM) -rf config.cache config.log config.status \ @@ -608,7 +611,7 @@ install: gforth$(EC)$(EXE) $(FORTH_SRC) echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \ fi -$(RM) gforth.fi - GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$bindir GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) + GFORTHD="./gforth-ditc$(OPT) -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc$(OPT) --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$bindir GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS $(RM) gforth.fi install.TAGS @@ -637,15 +640,15 @@ uninstall: FORCE @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth" check: gforths gforth.fi - $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 - $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1 - $(MAKE) checkone check-nofast ENGINE="./gforth-ditc" >/dev/null 2>&1 - $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1 - $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1 - $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1 + $(MAKE) checkone check-nofast ENGINE="./gforth$(OPT) --no-dynamic" >/dev/null 2>&1 + $(MAKE) checkone check-nofast ENGINE="./gforth-itc$(OPT)" >/dev/null 2>&1 + $(MAKE) checkone check-nofast ENGINE="./gforth-ditc$(OPT)" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-fast$(OPT) --no-dynamic" >/dev/null 2>&1 + $(MAKE) checkone check-nofast ENGINE="./gforth$(OPT)" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-fast$(OPT)" >/dev/null 2>&1 @echo "*** Check successful ***" -checkone test: gforth$(EC)$(EXE) gforth.fi engine/prim-s.i +checkone test: gforth.fi engine/prim-s.i $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out $(FORTH) test/other.fs -e bye $(FORTHS) test/signals.fs -e bye @@ -655,7 +658,7 @@ checkone test: gforth$(EC)$(EXE) gforth. "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \ tr -d '\015' | grep -v '^#line '|diff -c - engine/prim-s.i -check-nofast: gforth$(EC)$(EXE) gforth.fi +check-nofast: gforth.fi $(FORTHS) test/gforth-nofast.fs -e bye test/primtest.fi: test/primtest.fs mach32l.fs cross.fs @@ -664,7 +667,7 @@ test/primtest.fi: test/primtest.fs mach3 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 $$? -bench: gforth-fast$(EC)$(EXE) gforth.fi +bench: gforth-fast$(OPT)$(EC)$(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" @@ -674,7 +677,7 @@ bench: gforth-fast$(EC)$(EXE) gforth.fi onebench one-bench: $(FORTH_FAST) onebench.fs -all-bench allbench: gforth-fast$(EC)$(EXE) gforth$(EC)$(EXE) gforth-itc$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth.fi +all-bench allbench: ./gforth-fast --dynamic onebench.fs ./gforth-fast --no-dynamic onebench.fs ./gforth --dynamic onebench.fs @@ -754,8 +757,8 @@ kernl64l$(EC).fi: $(KERNLS) # -$(CP) $@ $@~ # -$(CP) $< $@ -gforth.fi: $(kernel_fi) gforthmi gforth$(EC)$(EXE) gforth-ditc$(EC)$(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)" includedir=`pwd`/include bindir=`pwd` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP) +gforth.fi: $(kernel_fi) gforthmi gforth-ditc$(OPT)$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs + GFORTHD="./gforth-ditc$(OPT) -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc$(OPT) --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP) # ------------- Make c-engine @@ -763,8 +766,8 @@ prim.b: prim cache0.vmg $(M4) -Dcondbranch_opt=0 $(srcdir)/prim >$@ sleep 1 #should make hpux-workaround unnecessary -prim-fast.b: prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg Makefile.in - $(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg $(srcdir)/prim >$@ +prim-fast.b: prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg cache-regs$(STACK_CACHE_REGS).vmg peeprules.vmg Makefile + $(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -DSTACK_CACHE_REGS=cache-regs$(STACK_CACHE_REGS).vmg $(srcdir)/prim >$@ sleep 1 #should make hpux-workaround unnecessary $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs @@ -788,41 +791,64 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- -gforth$(EC)$(EXE): engines - -$(CP) gforth$(EC)$(EXE) gforth~ - $(CP) engine/$@ $@ - -$(MASSAGE_EXE) $@ - @GFORTH_EXE@ -gforth-fast$(EC)$(EXE): engines-fast - $(CP) engine/$@ $@ - -$(MASSAGE_EXE) $@ - @GFORTHFAST_EXE@ +OPTS = @OPTS@ -gforth-native$(EC)$(EXE): engines-fast +MAKELINE-ll-reg = OPT=-ll-reg OPTDEFINES="-DFORCE_LL -DFORCE_REG" OPTOBJECTS= +MAKELINE-noll-reg = OPT=-noll-reg OPTDEFINES=-DFORCE_REG OPTOBJECTS=dblsub.o +MAKELINE-ll = OPT=-ll OPTDEFINES=-DFORCE_LL OPTOBJECTS= +MAKELINE-noll = OPT=-noll OPTDEFINES= OPTOBJECTS=dblsub.o + +gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h + if test -z "$(OPT)"; then \ + for i in $(OPTS); do make optgforth OPT=$$i && $(CP) gforth$${i}$(EC)$(EXE) $@ && break; done; \ + else \ + ( cd engine && $(MAKE) $@ ) && \ + $(CP) gforth$(OPT)$(EC)$(EXE) gforth~; \ + $(CP) engine/$@ $@ && \ + $(MASSAGE_EXE) $@; \ + @GFORTH_EXE@; \ + make checkone check-nofast ENGINE=./engine/$@; \ + fi + +optgforth: + make gforth$(OPT)$(EC)$(EXE) $(MAKELINE$(OPT)) + +gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE_FAST) engine/config.h + if test -z "$(OPT)"; then \ + for i in $(OPTS); do make optgforth-fast OPT=$$i && $(CP) gforth-fast$${i}$(EC)$(EXE) $@ && break; done; \ + else \ + ( cd engine && $(MAKE) $@ ) && \ + $(CP) engine/$@ $@ && \ + $(MASSAGE_EXE) $@; \ + @GFORTHFAST_EXE@; \ + make checkone ENGINE=./engine/$@; \ + fi + +optgforth-fast: + make gforth-fast$(OPT)$(EC)$(EXE) $(MAKELINE$(OPT)) + +gforth-native$(OPT)$(EC)$(EXE): engines-fast $(CP) engine/$@ $@ -$(MASSAGE_EXE) $@ #@GFORTHX_EXE@ -gforth-itc$(EC)$(EXE): engines - $(CP) engine/$@ $@ +gforth-itc$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h + cd engine && $(MAKE) gforth-itc-noll$(EC)$(EXE) $(MAKELINE-noll) + $(CP) engine/gforth-itc-noll$(EC)$(EXE) $@ @GFORTHITC_EXE@ -gforth-ditc$(EC)$(EXE): engines - $(CP) engine/$@ $@ +gforth-ditc$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h + cd engine && $(MAKE) gforth-ditc-noll$(EC)$(EXE) $(MAKELINE-noll) + $(CP) engine/gforth-ditc-noll$(EC)$(EXE) $@ @GFORTHDITC_EXE@ -gforth-prof$(EC)$(EXE): engines - $(CP) engine/$@ $@ +gforth-prof$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h + cd engine && $(MAKE) gforth-prof-noll$(EC)$(EXE) $(MAKELINE-noll) + $(CP) engine/gforth-prof-noll$(EC)$(EXE) $@ gforths: $(ENGINES) $(ENGINES_FAST) -engines: FORCE $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h - cd engine && $(MAKE) $(ENGINES) - -engines-fast: FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile engine/config.h - cd engine && $(MAKE) $(ENGINES_FAST) - # ------------- additional C primitives %.c: %.pri prim2cl.fs @@ -843,12 +869,12 @@ tags: gforth.tags install.TAGS: TAGS sed 's;^\$(srcdir)/;;' TAGS|awk 'BEGIN {RS="\014\n"; ORS=RS} {if (NR==1) print $0; else print "$(datadir)/gforth/$(VERSION)/"$$0;}' >install.TAGS -gforth.TAGS: @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS +gforth.TAGS: @kernel_fi@ gforth$(OPT)$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS $(FORTHK) etags.fs except.fs startup.fs -e bye cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS rm TAGS -gforth.tags: @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.tags kernel.tags +gforth.tags: @kernel_fi@ gforth$(OPT)$(EC)$(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