--- gforth/Makefile.in 2003/08/31 17:41:23 1.278 +++ gforth/Makefile.in 2004/01/18 22:00:20 1.292 @@ -57,7 +57,8 @@ CP = cp -p MV = mv TAR = tar cf - INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_INFO = @INSTALL_INFO@ LN_S = @LN_S@ @@ -75,7 +76,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 3 exboot.fs -e 'fpath= .|~+|$(srcdir)' +FORTHB = $(BUILDFORTH) -e 0 exboot.fs -e 'fpath= .|~+|$(srcdir)' # the Forth system for running prims2x.fs FORTHP = $(FORTH) ENGINE_FAST = $(ENGINE)-fast @@ -85,11 +86,11 @@ FORTHK = $(ENGINE) $(FORTHKFLAGS) #FORTHP = $(ENGINE) --die-on-signal -i ./$(kernel_fi) #the "-2 image-included-files +!" undoes the change to image-included-files # in exboot.fs -STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@ +STARTUP = -e 0 exboot.fs startup.fs @asm_fs@ @disasm_fs@ STRIP = strip TEXI2DVI = texi2dvi -e TEXI2PDF = texi2dvi --pdf -e -DVI2PS = dvips -Pcmz -t letterSize -Z +DVI2PS = dvips -t letterSize -Z #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/ MAKEINFO = makeinfo TEXI2HTML = texi2html @@ -127,13 +128,17 @@ man1ext= .1 emacssitelispdir=@lispdir@ siteforthdir=$(datadir)/gforth/site-forth +PROFOBJS = @PROFOBJS@ +PROFEXES = @PROFEXES@ + CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \ compat/CVS unix/CVS \ arch/CVS arch/generic/CVS arch/m68k/CVS arch/mips/CVS \ arch/386/CVS arch/hppa/CVS arch/sparc/CVS arch/power/CVS \ arch/alpha/CVS arch/4stack/CVS arch/misc/CVS arch/6502/CVS \ arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \ - arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS + arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS arch/amd64/CVS \ + arch/arm/CVS INCLUDES = engine/forth.h engine/threaded.h engine/io.h @@ -243,6 +248,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ test/string.fs test/float.fs test/gforth.fs \ test/other.fs test/signals.fs test/checkans.fs \ + test/primtest.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 \ @@ -277,7 +283,10 @@ ARCHS = \ arch/power/machine.h \ arch/power/_sync_cache_range.c \ arch/alpha/machine.h \ + arch/arm/machine.h \ arch/ia64/machine.h \ + arch/ia64/flush_icache_block.c \ + arch/amd64/machine.h \ arch/4stack/README \ arch/4stack/asm.fs \ arch/4stack/mach.fs \ @@ -287,6 +296,7 @@ ARCHS = \ arch/misc/README \ arch/misc/asm.fs \ arch/misc/mach.fs \ + arch/misc/optcmove.fs \ arch/misc/prim.fs \ arch/misc/sim.fs \ arch/misc/sokoban.fs \ @@ -333,7 +343,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 \ @@ -342,12 +352,14 @@ 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 \ 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/ecvt.c engine/memcmp.c engine/rint.c \ + engine/strtol.c engine/strtoul.c \ engine/ansidecl.h engine/memmove.c \ engine/pow10.c engine/atanh.c engine/cleanalign.c \ engine/strerror.c engine/strsignal.c engine/dblsub.c \ @@ -363,15 +375,22 @@ SOURCES = $(CVSDIRS) compat Makefile.in RCS_FILES = ToDo model high-level -ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) #gforth-prof$(EXE) #gforth-native$(EXE) +ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-itc$(EXE) $(PROFEXES) + +ENGINES_FAST = gforth-fast$(EXE) gforth-native$(EXE) -GEN = $(ENGINES) kernel/version.fs +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 @@ -452,7 +471,7 @@ clean: mostlyclean -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \ engine/gforth$(EXE) engine/gforth-fast$(EXE) \ engine/gforth-native$(EXE) engine/gforth-itc$(EXE) \ - engine/gforth-ditc$(EXE) #engine/gforth-prof$(EXE) + engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) distclean: clean -$(RM) -rf config.cache config.log config.status \ @@ -523,14 +542,14 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker -$(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) + $(INSTALL_PROGRAM) 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) + $(INSTALL_PROGRAM) 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) + $(INSTALL_PROGRAM) 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_SCRIPT) gforthmi $(bindir)/gforthmi-$(VERSION) + $(INSTALL_SCRIPT) vmgen $(bindir)/vmgen-$(VERSION) $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION) (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi) (cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen) @@ -588,6 +607,12 @@ 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" + +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$(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" @@ -687,54 +712,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)" $(srcdir)/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 $@- @@ -748,19 +738,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@ @@ -775,11 +762,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 @@ -915,7 +905,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