From f3e40d2b2c211ff34d2f71c594710adf6a9c8ff9 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 8 Dec 2011 15:52:46 +0000 Subject: web2c: Consistency of `constants' git-svn-id: svn://tug.org/texlive/trunk@24797 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/alephdir/ChangeLog | 9 ++++ Build/source/texk/web2c/alephdir/Makefile | 74 ---------------------------- Build/source/texk/web2c/alephdir/aleph.test | 9 ++++ Build/source/texk/web2c/alephdir/am/aleph.am | 13 ++++- Build/source/texk/web2c/alephdir/com16bit.ch | 7 ++- Build/source/texk/web2c/alephdir/om16bit.ch | 12 ++++- Build/source/texk/web2c/alephdir/omocp.ch | 2 +- 7 files changed, 46 insertions(+), 80 deletions(-) delete mode 100644 Build/source/texk/web2c/alephdir/Makefile create mode 100755 Build/source/texk/web2c/alephdir/aleph.test (limited to 'Build/source/texk/web2c/alephdir') diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog index dd148a799b5..0d6acf17aab 100644 --- a/Build/source/texk/web2c/alephdir/ChangeLog +++ b/Build/source/texk/web2c/alephdir/ChangeLog @@ -1,3 +1,12 @@ +2011-12-08 Peter Breitenlohner + + * com16bit.ch, om16bit.ch: Consistency of `constants'. + * omocp.ch: Adjust to null, i.e., min_halfword <0. + + * aleph.test (new): Just testing 'aleph -version'. + * Makefile (removed): Unused. + * am/aleph.am: Adjusted. + 2011-09-30 Peter Breitenlohner * com16bit.ch.ch (print_file_line): Bug fix: avoid uninitialized diff --git a/Build/source/texk/web2c/alephdir/Makefile b/Build/source/texk/web2c/alephdir/Makefile deleted file mode 100644 index c04d858db9b..00000000000 --- a/Build/source/texk/web2c/alephdir/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# Files used to create an Aleph without e-TeX extensions -noaleph_files = \ - om16bit.ch \ - omstr.ch \ - omfont.ch \ - omchar.ch \ - omfi.ch \ - ompar.ch \ - omocp.ch \ - omfilter.ch \ - omtrans.ch \ - omdir.ch \ - -# Files to add e-TeX extensions to Aleph -aleph_build=rc1 - -aleph_files = \ - eobase.ch \ - eofmt.ch \ - eomem-$(aleph_build).ch \ - eo16bit-$(aleph_build).ch \ - eoext.ch \ - eoeqtb.ch \ - eofix.ch \ - eocprt.ch \ - eonewdir-$(aleph_build).ch \ - eover-$(aleph_build).ch \ - eopage-$(aleph_build).ch \ - eochar-$(aleph_build).ch - -new_tex = tex-new.web -old_tex = tex-old.web - -localdir = c:/texmf/miktex/bin/ -tie = $(localdir)tie.exe -tangle = $(localdir)tangle.exe -weave = $(localdir)weave.exe - -sourcedir = c:/sorci/miktex/miktex/ - -rm = rm -cp = cp - -all: aleph.p aleph.pdf - -etex.web: $(old_tex) etex.ch - $(tie) -m etex.web $(old_tex) etex.ch - -noaleph.web: $(new_tex) $(noaleph_files) - $(tie) -m noaleph.web $(new_tex) $(noaleph_files) - -aleph.web: noaleph.web $(aleph_files) - $(tie) -m aleph.web noaleph.web $(aleph_files) - $(cp) aleph.web aleph-$(aleph_build).web - -aleph.p aleph.pool: aleph.web - $(tangle) aleph.web nul.ch aleph.p aleph.pool - $(cp) aleph.pool aleph-$(aleph_build).pool - -aleph.tex: aleph.web - $(weave) aleph.web nul aleph.tex - -aleph.pdf: aleph.tex - pdftex aleph - $(cp) aleph.pdf aleph-$(aleph_build).pdf - -clean: - $(rm) -f noaleph.web - $(rm) -f aleph.web - $(rm) -f aleph.tex - $(rm) -f aleph.pdf - $(rm) -f aleph.log - $(rm) -f aleph.p - $(rm) -f aleph.pool diff --git a/Build/source/texk/web2c/alephdir/aleph.test b/Build/source/texk/web2c/alephdir/aleph.test new file mode 100755 index 00000000000..54b658c2657 --- /dev/null +++ b/Build/source/texk/web2c/alephdir/aleph.test @@ -0,0 +1,9 @@ +#! /bin/sh + +# Copyright (C) 2011 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +# Not really a test, just making sure the program executes. + +./aleph -version || exit 1 + diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am index 2f0e9528484..28649b0e814 100644 --- a/Build/source/texk/web2c/alephdir/am/aleph.am +++ b/Build/source/texk/web2c/alephdir/am/aleph.am @@ -1,6 +1,6 @@ ## texk/web2c/alephdir/am/aleph.am: Makefile fragment for Aleph. ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner +## Copyright (C) 2009-2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## Aleph @@ -94,7 +94,16 @@ DISTCLEANFILES += $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c \ EXTRA_DIST += \ alephdir/ChangeLog \ - alephdir/Makefile \ alephdir/aleph.defines \ alephdir/aleph.version +# Aleph Tests +# +aleph_tests = alephdir/aleph.test + +EXTRA_DIST += $(aleph_tests) + +if ALEPH +TESTS += $(aleph_tests) +endif ALEPH + diff --git a/Build/source/texk/web2c/alephdir/com16bit.ch b/Build/source/texk/web2c/alephdir/com16bit.ch index a519182f973..87ceac71690 100644 --- a/Build/source/texk/web2c/alephdir/com16bit.ch +++ b/Build/source/texk/web2c/alephdir/com16bit.ch @@ -786,7 +786,7 @@ been commented~out. @y @z -@x [8.112] l.2435 - Efficiency. +@x [8.112] l.2450 - Efficiency. macros are simplified in the obvious way when |min_quarterword=0|. @^inner loop@>@^system dependencies@> @@ -803,6 +803,11 @@ macros are simplified in the obvious way when |min_quarterword=0|. So they have been simplified here in the obvious way. @^inner loop@>@^system dependencies@> +The \.{WEB} source for \TeX\ defines |hi(#)==#+min_halfword| which can be +simplified when |min_halfword=0|. The Web2C implemetation of \Aleph\ can +use |hi(#)==#| together with |min_halfword<0| as long as |max_halfword| is +sufficiently large. + @d qi(#)==# {to put an |eight_bits| item into a quarterword} @d qo(#)==# {to take an |eight_bits| item from a quarterword} @d hi(#)==# {to put a sixteen-bit item into a halfword} diff --git a/Build/source/texk/web2c/alephdir/om16bit.ch b/Build/source/texk/web2c/alephdir/om16bit.ch index 9017f677d10..d07ec58a03a 100644 --- a/Build/source/texk/web2c/alephdir/om16bit.ch +++ b/Build/source/texk/web2c/alephdir/om16bit.ch @@ -177,7 +177,7 @@ if the subrange is `|-128..127|'. @d max_halfword==65535 {largest allowable value in a |halfword|} @y @d max_quarterword=@"FFFF {largest allowable value in a |quarterword|} -@d min_halfword=0 {smallest allowable value in a |halfword|} +@d min_halfword=-@"3FFFFFFF {smallest allowable value in a |halfword|} @d max_halfword=@"3FFFFFFF {largest allowable value in a |halfword|} @z %--------------------------------------- @@ -189,7 +189,15 @@ if (min_quarterword>0)or(max_quarterword<@"7FFF) then bad:=11; if (min_halfword>0)or(max_halfword<@"3FFFFFFF) then bad:=12; @z %--------------------------------------- -@x [8] m.111 l.2423 - Omega +@x [8.111] l.2435 - min_halfword and max_halfword +if (mem_min=max_halfword)or@| + (mem_bot-mem_min>max_halfword+1) then bad:=14; +@y +if (mem_bot-sup_main_memory=max_halfword) then bad:=14; +@z +%--------------------------------------- +@x [8] m.111 l.2438 - Omega if font_max>font_base+256 then bad:=16; @y if font_max>font_base+@"10000 then bad:=16; diff --git a/Build/source/texk/web2c/alephdir/omocp.ch b/Build/source/texk/web2c/alephdir/omocp.ch index 039903327fb..3150d5943a9 100644 --- a/Build/source/texk/web2c/alephdir/omocp.ch +++ b/Build/source/texk/web2c/alephdir/omocp.ch @@ -644,7 +644,7 @@ else begin while r <> 0 do begin p:=q; q:=r; r:=ocp_lstack_lnext(r); end; - ocp_lstack_lnext(p) := null; + ocp_lstack_lnext(p) := 0; end end; end; -- cgit v1.2.3