--- gforth/hash.fs 1995/11/07 18:06:43 1.10 +++ gforth/hash.fs 2000/04/02 21:48:54 1.24 @@ -1,6 +1,6 @@ \ Hashed dictionaries 15jul94py -\ Copyright (C) 1995 Free Software Foundation, Inc. +\ Copyright (C) 1995,1998 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -18,112 +18,174 @@ \ along with this program; if not, write to the Free Software \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -11 value hashbits +[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 + +[IFUNDEF] hash +: hash ( addr len -- key ) + hashbits (hashkey1) ; +[THEN] + Variable insRule insRule on Variable revealed \ Memory handling 10oct94py Variable HashPointer -Variable HashTable Variable HashIndex +0 Value HashTable + +\ forward declarations +0 Value hashsearch-map +Defer hash-alloc ( addr -- addr ) \ 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 ) - [ 3 cells ] Literal + @ >r - 2dup hash r> xor cells HashTable @ + @ (hashfind) ; + >r 2dup r> bucket @ (hashfind) ; \ hash vocabularies 16jul94py : lastlink! ( addr link -- ) BEGIN dup @ dup WHILE nip REPEAT drop ! ; -: (reveal ( addr voc -- ) [ 3 cells ] Literal + dup @ 0< IF 2drop EXIT THEN - @ over cell+ count $1F and Hash xor cells >r - HashPointer 2 Cells $400 NewFix - tuck cell+ ! r> HashTable @ + insRule @ - IF dup @ 2 pick ! ! ELSE lastlink! THEN revealed on ; - -: hash-reveal ( -- ) (reveal) last? IF - current @ (reveal THEN ; +: (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 ; + +: hash-reveal ( nfa wid -- ) + 2dup (reveal) (reveal ; + +: inithash ( wid -- ) + wordlist-extend + insRule @ >r insRule off hash-alloc 3 cells - + dup wordlist-id + BEGIN @ dup WHILE 2dup swap (reveal REPEAT + 2drop r> insRule ! ; : addall ( -- ) voclink - BEGIN @ dup @ WHILE dup 'initvoc REPEAT drop ; + 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 + HashTable Hashlen cells bounds DO I @ - BEGIN dup WHILE - dup @ swap HashPointer DelFix - REPEAT I ! - cell +LOOP HashIndex off ; - -: re-hash clearhash addall ; -: (rehash) ( addr -- ) - drop revealed @ IF re-hash revealed off THEN ; + BEGIN dup WHILE + dup @ swap HashPointer DelFix + REPEAT + I ! + cell +LOOP + HashIndex off + voclink + 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 ; -Create hashsearch ' hash-find A, ' hash-reveal A, ' (rehash) A, +: (rehash) ( wid -- ) + dup wordlist-extend @ 0= + IF inithash + ELSE rehashall THEN ; + +\ >rom ?! +align here ' hash-find A, ' hash-reveal A, ' (rehash) A, ' (rehash) A, +to hashsearch-map \ hash allocate and vocabulary initialization 10oct94py -: hash-alloc ( addr -- addr ) HashTable @ 0= IF - Hashlen cells allocate throw HashTable ! - HashTable @ Hashlen cells erase THEN +:noname ( addr -- addr ) + HashTable 0= + IF Hashlen cells reserve-mem TO HashTable + HashTable Hashlen cells erase THEN HashIndex @ over ! 1 HashIndex +! HashIndex @ Hashlen >= - IF clearhash + [ [IFUNDEF] allocate ] + ABORT" no more space in hashtable" + [ [ELSE] ] + IF HashTable >r clearhash 1 hashbits 1+ dup to hashbits lshift to hashlen - HashTable @ free - addall - THEN ; - -: (initvoc) ( addr -- ) - cell+ dup @ 0< IF drop EXIT THEN - insRule @ >r insRule off hash-alloc - 3 cells - hashsearch over cell+ ! dup - BEGIN @ dup WHILE 2dup swap (reveal REPEAT - 2drop r> insRule ! ; - -' (initvoc) IS 'initvoc + r> free >r 0 to HashTable + addall r> throw + 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 ( -- ) Defers 'cold - HashPointer off HashTable off HashIndex off - voclink - BEGIN @ dup @ WHILE - dup cell - @ >r - dup 'initvoc - r> over cell - ! - REPEAT drop ; -' hash-cold IS 'cold +' hash-cold INIT8 chained : .words ( -- ) - base @ >r hex HashTable @ Hashlen 0 + 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 @@ -133,7 +195,7 @@ addall \ Baum aufbauen \ \ gives the number of words in the current wordlist \ \ and the sum of squares for the sublist lengths \ 0 0 -\ hashtable @ Hashlen cells bounds DO +\ hashtable Hashlen cells bounds DO \ 0 i BEGIN \ @ dup WHILE \ swap 1+ swap