--- gforth/Makefile.in 2004/12/25 17:04:30 1.301 +++ gforth/Makefile.in 2006/04/09 13:52:46 1.324 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc. #This file is part of Gforth. @@ -88,8 +88,8 @@ FORTHK = $(ENGINE) $(FORTHKFLAGS) # in exboot.fs STARTUP = exboot.fs startup.fs @asm_fs@ @disasm_fs@ STRIP = strip -TEXI2DVI = texi2dvi -e -TEXI2PDF = texi2dvi --pdf -e +TEXI2DVI = texi2dvi +TEXI2PDF = texi2dvi --pdf DVI2PS = dvips -t letterSize -Z #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/ MAKEINFO = makeinfo @@ -109,7 +109,9 @@ XLDFLAGS = @LDFLAGS@ LDFLAGS = $(DEBUGFLAG) $(XLDFLAGS) LDLIBS = @LIBS@ -# ------------ Install Directorys +STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@ + +# ------------ Install Directories VPATH = @srcdir@ prefix = @prefix@ @@ -138,7 +140,7 @@ CVSDIRS = CVS engine/CVS kernel/CVS doc/ 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/amd64/CVS \ - arch/arm/CVS + arch/arm/CVS arch/r8c/CVS INCLUDES = engine/forth.h engine/threaded.h engine/io.h @@ -177,7 +179,8 @@ KERN_SRC = \ kernel/saccept.fs \ kernel/doers.fs \ kernel/getdoers.fs \ - kernel/pass.fs + kernel/pass.fs \ + kernel/xchars.fs EC_SRC = \ asm/README \ @@ -191,7 +194,8 @@ EC_SRC = \ ec/shex.fs \ ec/builttag.fs \ ec/dotx.fs \ - ec/nesting.fs + ec/nesting.fs \ + build-ec.in GFORTH_FI_SRC = \ assert.fs \ @@ -200,10 +204,12 @@ GFORTH_FI_SRC = \ blocks.fs \ bufio.fs \ code.fs \ + complex.fs \ debug.fs \ debugs.fs \ dis-gdb.fs \ ekey.fs \ + envos.fs \ savesys.fs \ environ.fs \ errors.fs \ @@ -211,6 +217,7 @@ GFORTH_FI_SRC = \ except.fs \ extend.fs \ float.fs \ + fft.fs \ glocals.fs \ hash.fs \ history.fs \ @@ -234,14 +241,15 @@ GFORTH_FI_SRC = \ wordinfo.fs \ arch/386/asm.fs arch/386/disasm.fs \ arch/amd64/asm.fs arch/amd64/disasm.fs \ - arch/alpha/asm.fs arch/alpha/disasm.fs \ - arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs + arch/alpha/asm.fs arch/alpha/disasm.fs arch/alpha/testasm.fs\ + arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs \ + arch/mips/testasm.fs arch/mips/testdisasm.fs FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ ans-report.fs ansi.fs answords.fs \ colorize.fs comp-i.fs \ depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \ - envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \ + envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \ fsl-util.4th glosgen.fs gray.fs httpd.fs proxy.fs \ make-app.fs doc/makedoc.fs \ locate.fs more.fs other.fs prims2x.fs random.fs \ @@ -251,11 +259,11 @@ 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 \ + test/primtest.fs test/coreext.fs test/deferred.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 \ - add.fs lib.fs oldlib.fs fflib.fs sieve.fs unix/socket.fs + add.fs lib.fs oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs COMPAT = compat/README \ compat/anslocal.fs \ @@ -263,6 +271,7 @@ COMPAT = compat/README \ compat/control.fs \ compat/defer.fs \ compat/exception.fs \ + compat/execute-parsing.fs \ compat/loops.fs \ compat/required.fs \ compat/strcomp.fs \ @@ -277,6 +286,7 @@ ALLSUBDIRS = engine ARCHS = \ arch/generic/machine.h \ + arch/generic/128bit.h \ arch/m68k/machine.h \ arch/mips/machine.h \ arch/386/machine.h \ @@ -304,21 +314,8 @@ ARCHS = \ arch/misc/sim.fs \ arch/misc/sokoban.fs \ arch/misc/tt.fs \ - arch/6502/asm.fs \ arch/6502/prim.fs \ arch/6502/mach.fs \ - arch/6502/zero.fs \ - arch/6502/softuart.fs \ - arch/6502/cold.fs \ - arch/8086/asm.fs \ - arch/8086/mach.fs \ - arch/8086/mach.sh \ - arch/8086/prim.fs \ - arch/avr/asm.fs \ - arch/c165/asm.fs \ - arch/c165/mach.fs \ - arch/c165/prim.fs \ - arch/h8/asm.fs \ arch/shboom/asm.fs \ arch/shboom/compiler.fs \ arch/shboom/dis.fs \ @@ -330,10 +327,30 @@ ARCHS = \ arch/sharc/mach.fs \ arch/sharc/machine.h \ arch/sharc/compile.sharc \ - arch/sharc/unistd.h \ arch/sharc/systypes.h \ arch/sharc/types.h \ - arch/sharc/g21k-3.3.4-bp1.diff + arch/sharc/g21k-3.3.4-bp1.diff \ + arch/r8c/asm.fs \ + arch/r8c/asm-test.fs \ + arch/r8c/prim.fs \ + arch/r8c/mach.fs + +#not included in distribution until distribution terms are included: +ARCHS_NO_DIST = \ + arch/6502/asm.fs \ + arch/6502/cold.fs \ + arch/6502/softuart.fs \ + arch/6502/zero.fs \ + arch/8086/asm.fs \ + arch/8086/mach.fs \ + arch/8086/mach.sh \ + arch/8086/prim.fs \ + arch/avr/asm.fs \ + arch/c165/asm.fs \ + arch/c165/mach.fs \ + arch/c165/prim.fs \ + arch/h8/asm.fs \ + arch/sharc/unistd.h VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \ vmgen-ex/engine.c vmgen-ex/fib.mini \ @@ -374,13 +391,14 @@ SOURCES = $(CVSDIRS) compat Makefile.in gforthmi.cmd glosgen.glo doc/glossaries.doc \ $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \ timings.sc \ - test/coretest.out test/checkans.out + test/coretest.out test/checkans.out \ + cache-fast*.vmg RCS_FILES = ToDo model high-level ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-itc$(EXE) $(PROFEXES) -ENGINES_FAST = gforth-fast$(EXE) gforth-native$(EXE) +ENGINES_FAST = gforth-fast$(EXE) #gforth-native$(EXE) GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs @@ -394,18 +412,18 @@ FORTH_GEN_ENGINE_FAST= \ 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_GEN_PRIMB = $(FORTH_GEN_ENGINE) $(FORTH_GEN_ENGINE_FAST) kernel/aliases.fs kernel/prim.fs FORTH_GEN0 = prim.b $(FORTH_GEN_PRIMB) FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi # this is used for antidependences, -FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ +FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec #kernel dependencies KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs #distributed documentation DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \ - doc/vmgen.info doc/vmgen.info-* doc/vmgen.ps + doc/vmgen.info doc/vmgen.ps KERNLS = kernl16b.fi- kernl16l.fi- \ kernl32b.fi- kernl32l.fi- \ @@ -440,6 +458,8 @@ kernel/version.fs: version echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs more: engines $(FORTH_GEN) $(GEN) + @make check + @$(FORTH_FAST) --diag -e bye #from the gcc Makefile: #"Deletion of files made during compilation. @@ -480,7 +500,8 @@ distclean: clean -$(RM) -rf config.cache config.log config.status \ engine/config.h Makefile Makedist engine/Makefile \ stamp-h engine/stamp-h \ - doc/version.texi gforthmi vmgen + doc/version.texi gforthmi vmgen \ + prim-fast.b $(FORTH_GEN_ENGINE_FAST) #realclean is useless, but dangerous, so it's commented out realclean: distclean @@ -496,7 +517,7 @@ virtualclean: mostlyclean #rules in Makedist (you can use them with GNU make on these systems). dist: Makedist machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' -e 's/@[L]IBFFIFLAG@/false/g' machpc.fs $(MAKE) -f Makedist d$@ -$(RM) machpc.fs @@ -541,56 +562,56 @@ hpux-workaround: #we rebuild gforth.fi, because it contains some path names. #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership. install: gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs - 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) gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) - (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE)) - $(INSTALL_PROGRAM) gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) - (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE)) - $(INSTALL_PROGRAM) gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) - (cd $(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE)) - $(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) - -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir) - -for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(infodir); done + touch $(DESTDIR)$(siteforthdir)/siteinit.fs + -$(RM) $(DESTDIR)$(bindir)/gforth$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen + -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) + -$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE) + $(INSTALL_PROGRAM) gforth$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE)) + $(INSTALL_PROGRAM) gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE)) + $(INSTALL_PROGRAM) gforth-itc$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE)) + $(INSTALL_SCRIPT) gforthmi $(DESTDIR)$(bindir)/gforthmi-$(VERSION) + $(INSTALL_SCRIPT) vmgen $(DESTDIR)$(bindir)/vmgen-$(VERSION) + $(INSTALL_PROGRAM) gforth-ditc $(DESTDIR)$(libdir)/gforth/$(VERSION) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi) + (cd $(DESTDIR)$(bindir) && $(LN_S) vmgen-$(VERSION) vmgen) + -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(DESTDIR)$(man1dir) + -for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done for i in $(FORTH_SRC) $(COMPAT) prim; do \ - $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \ + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \ done - $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION) + $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION) @if test -d "$(emacssitelispdir)"; then \ - $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ + $(INSTALL_DATA) $(srcdir)/gforth.el $(DESTDIR)$(emacssitelispdir); \ else \ echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ fi -$(RM) gforth.fi - GFORTHD="./gforth-ditc -p $(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) - $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) - $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS + 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)" ./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 - $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/gforth.info - $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/vmgen.info + $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info + $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info install-strip: install installdirs: mkinstalldirs for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir); do \ - $(srcdir)/mkinstalldirs $$i; \ + $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \ done for i in $(CVSDIRS); do \ - $(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/gforth/$(VERSION)/`dirname $$i`; \ done - $(RM) -rf $(datadir)/gforth/$(VERSION)/engine + $(RM) -rf $(DESTDIR)$(datadir)/gforth/$(VERSION)/engine #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)/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" + -$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)(bindir)/vmgen-$(VERSION) + @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(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 ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 @@ -602,7 +623,7 @@ check: gforths gforth.fi @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 test/deferred.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out + $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/gforth.fs test/deferred.fs test/coreext.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 | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out @@ -611,7 +632,7 @@ checkone test: gforth$(EXE) gforth.fi 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" + $(FORTHB) -e 's" mach32b.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 $$? @@ -719,8 +740,8 @@ prim.b: prim cache0.vmg m4 -s $(srcdir)/prim >$@ sleep 1 #should make hpux-workaround unnecessary -prim-fast.b: prim cache1.vmg peeprules.vmg - m4 -DM4_ENGINE_FAST -s $(srcdir)/prim >$@ +prim-fast.b: prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg + m4 -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -s $(srcdir)/prim >$@ sleep 1 #should make hpux-workaround unnecessary $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs @@ -905,10 +926,10 @@ stamp-h.in: configure.in aclocal.m4 echo timestamp > $(srcdir)/stamp-h.in engine/config.h: stamp-h -stamp-h: engine/config.h.in config.status +stamp-h: engine/config.h.in config.status stamp-h.in ./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 +Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi envos.fs build-ec: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in ./config.status config.status: configure