--- gforth/hash.fs 1994/09/12 19:00:31 1.3 +++ gforth/hash.fs 2003/01/20 17:07:37 1.32 @@ -1,97 +1,225 @@ \ Hashed dictionaries 15jul94py -7 value hashbits +\ Copyright (C) 1995,1998,2000 Free Software Foundation, Inc. + +\ This file is part of Gforth. + +\ Gforth is free software; you can redistribute it and/or +\ modify it under the terms of the GNU General Public License +\ as published by the Free Software Foundation; either version 2 +\ of the License, or (at your option) any later version. + +\ This program is distributed in the hope that it will be useful, +\ but WITHOUT ANY WARRANTY; without even the implied warranty of +\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +\ GNU General Public License for more details. + +\ You should have received a copy of the GNU General Public License +\ along with this program; if not, write to the Free Software +\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + +[IFUNDEF] erase +: erase ( addr len -- ) 0 fill ; +[THEN] + +[IFUNDEF] allocate +: reserve-mem here swap allot ; +\ move to a kernel/memory.fs +[ELSE] +: reserve-mem allocate throw ; +[THEN] + +[IFUNDEF] hashbits +11 Value hashbits +[THEN] 1 hashbits lshift Value Hashlen +\ compute hash key 15jul94py + +has? ec [IF] [IFUNDEF] hash +: hash ( addr len -- key ) + over c@ swap 1- IF swap char+ c@ + ELSE nip THEN + [ Hashlen 1- ] literal and ; +[THEN] [THEN] + +[IFUNDEF] hash +: hash ( addr len -- key ) + hashbits (hashkey1) ; +[THEN] + Variable insRule insRule on +Variable revealed -\ Memory handling 15jul94py +\ Memory handling 10oct94py -Variable HashPointer +AVariable HashPointer +Variable HashIndex \ Number of wordlists +Variable HashPop \ Number of words +0 AValue HashTable -: hash-alloc ( addr -- addr ) dup @ 0= IF - Hashlen cells allocate throw over ! - dup @ Hashlen cells erase THEN ; +\ forward declarations +0 AValue hashsearch-map +Defer hash-alloc ( addr -- addr ) -\ DelFix and NewFix is from bigFORTH 15jul94py +\ DelFix and NewFix are from bigFORTH 15jul94py : DelFix ( addr root -- ) dup @ 2 pick ! ! ; : NewFix ( root len # -- addr ) - BEGIN 2 pick @ ?dup 0= WHILE 2dup * allocate throw + BEGIN 2 pick @ ?dup 0= WHILE 2dup * reserve-mem over 0 ?DO dup 4 pick DelFix 2 pick + LOOP drop REPEAT >r drop r@ @ rot ! r@ swap erase r> ; -\ compute hash key 15jul94py - -: hash ( addr len -- key ) - hashbits (hashkey1) ; -\ (hashkey) -\ Hashlen 1- and ; - +: bucket ( addr len wordlist -- bucket-addr ) + \ @var{bucket-addr} is the address of a cell that points to the first + \ element in the list of the bucket for the string @var{addr len} + wordlist-extend @ -rot hash xor ( bucket# ) + cells HashTable + ; : hash-find ( addr len wordlist -- nfa / false ) - $C + @ >r - 2dup hash cells r> + @ (hashfind) ; + >r 2dup r> bucket @ (hashlfind) ; \ hash vocabularies 16jul94py : lastlink! ( addr link -- ) BEGIN dup @ dup WHILE nip REPEAT drop ! ; -: (reveal ( addr voc -- ) $C + dup @ 0< IF 2drop EXIT THEN - hash-alloc @ over cell+ count $1F and Hash cells + >r - HashPointer 8 $400 NewFix - tuck cell+ ! r> insRule @ - IF dup @ 2 pick ! ! ELSE lastlink! THEN ; - -: hash-reveal ( -- ) (reveal) last? IF - current @ (reveal THEN ; - -Create hashsearch ' hash-find A, ' hash-reveal A, ' drop A, - -: (initvoc ( addr -- ) - cell+ dup @ 0< IF drop EXIT THEN - insRule @ >r insRule off hash-alloc - 3 cells - hashsearch over cell+ ! dup +: (reveal ( nfa wid -- ) + over name>string rot bucket >r + HashPointer 2 Cells $400 NewFix + tuck cell+ ! r> insRule @ + IF + dup @ 2 pick ! ! + ELSE + lastlink! + THEN + revealed on 1 HashPop +! 0 hash-alloc drop ; + +: hash-reveal ( nfa wid -- ) + 2dup (reveal) (reveal ; + +: inithash ( wid -- ) + wordlist-extend + insRule @ >r insRule off 1 hash-alloc over ! 3 cells - + dup wordlist-id BEGIN @ dup WHILE 2dup swap (reveal REPEAT 2drop r> insRule ! ; -' (initvoc IS 'initvoc - : addall ( -- ) + HashPop off voclink + BEGIN @ dup WHILE + dup 0 wordlist-link - + dup wordlist-map @ reveal-method @ ['] hash-reveal = + IF inithash ELSE drop THEN + REPEAT drop ; + +: clearhash ( -- ) + HashTable Hashlen cells bounds + DO I @ + BEGIN dup WHILE + dup @ swap HashPointer DelFix + REPEAT + I ! + cell +LOOP + HashIndex off voclink - BEGIN @ dup @ WHILE dup (initvoc REPEAT drop ; + BEGIN ( wordlist-link-addr ) + @ dup + WHILE ( wordlist-link ) + dup 0 wordlist-link - ( wordlist-link wid ) + dup wordlist-map @ hashsearch-map = + IF ( wordlist-link wid ) + 0 swap wordlist-extend ! + ELSE + drop + THEN + REPEAT + drop ; + +: rehashall ( wid -- ) + drop revealed @ + IF clearhash addall revealed off + THEN ; + +: (rehash) ( wid -- ) + dup wordlist-extend @ 0= + IF inithash + ELSE rehashall THEN ; + +: hashdouble ( -- ) + HashTable >r clearhash + 1 hashbits 1+ dup to hashbits lshift to hashlen + r> free >r 0 to HashTable + addall r> throw ; + +const Create (hashsearch-map) +' hash-find A, ' hash-reveal A, ' (rehash) A, ' (rehash) A, +(hashsearch-map) to hashsearch-map + +\ hash allocate and vocabulary initialization 10oct94py + +:noname ( n+ -- n ) + HashTable 0= + IF Hashlen cells reserve-mem TO HashTable + HashTable Hashlen cells erase THEN + HashIndex @ swap HashIndex +! + HashIndex @ Hashlen >= + [ [IFUNDEF] allocate ] + ABORT" no more space in hashtable" + [ [ELSE] ] + HashPop @ hashlen 2* >= or + IF hashdouble THEN + [ [THEN] ] ; is hash-alloc \ Hash-Find 01jan93py +has? cross 0= +[IF] +: make-hash + hashsearch-map forth-wordlist wordlist-map ! + addall ; + make-hash \ Baumsuche ist installiert. +[ELSE] + hashsearch-map forth-wordlist wordlist-map ! +[THEN] + +\ for ec version display that vocabulary goes hashed + +: hash-cold ( -- ) +[ has? ec [IF] ] ." Hashing..." [ [THEN] ] + HashPointer off 0 TO HashTable HashIndex off + addall +\ voclink +\ BEGIN @ dup WHILE +\ dup 0 wordlist-link - initvoc +\ REPEAT drop +[ has? ec [IF] ] ." Done" cr [ [THEN] ] ; -addall \ Baum aufbauen -\ Baumsuche ist installiert. +' hash-cold INIT8 chained : .words ( -- ) - base @ >r hex context @ 3 cells + HashLen 0 - DO cr i 2 .r ." : " dup @ i cells + + base @ >r hex HashTable Hashlen 0 + DO cr i 2 .r ." : " dup i cells + BEGIN @ dup WHILE - dup cell+ @ .name REPEAT drop + dup cell+ @ name>string type space REPEAT drop LOOP drop r> base ! ; \ \ this stuff is for evaluating the hash function \ : square dup * ; \ : countwl ( -- sum sumsq ) -\ \ gives the number of words in the current wordlist and the sum of -\ \ squares for the sublist lengths +\ \ gives the number of words in the current wordlist +\ \ and the sum of squares for the sublist lengths \ 0 0 -\ context @ 3 cells + @ hashlen cells over + swap DO -\ 0 i BEGIN -\ @ dup WHILE -\ swap 1+ swap -\ REPEAT -\ drop -\ swap over square + -\ >r + r> -\ 1 cells -\ +LOOP ; +\ hashtable Hashlen cells bounds DO +\ 0 i BEGIN +\ @ dup WHILE +\ swap 1+ swap +\ REPEAT +\ drop +\ swap over square + +\ >r + r> +\ 1 cells +\ +LOOP ; \ : chisq ( -- n ) -\ \ n should have about the same size as hashlen -\ countwl hashlen 2 pick */ swap - ; +\ \ n should have about the same size as Hashlen +\ countwl Hashlen 2 pick */ swap - ;