add EVALUATE-STREAM and stuff

[rrq/rrqforth.git] / wordlists.asm

diff --git a/wordlists.asm b/wordlists.asm
index 4862dd1ec8994ef32dfe3cd949cedd484473d1ce..c67e6c9f7e5e06963c397568b968029e98e17024 100644 (file)
--- a/wordlists.asm
+++ b/wordlists.asm
@@ -99,7 +99,7 @@ p_strncmp_end:
        next
 
        WORD p_find,'FIND'
-       ;; ( chars length -- [ chars 0 | cfa 1 )
+       ;; ( chars length -- [ 0 ]|[ tfa ] )
        ;; Search the current wordlists for the given pname
        pushr rsi
        mov rcx,[p_wordlist_DFA]
@@ -108,10 +108,10 @@ p_strncmp_end:
        mov rax,[rsp+8]
 p_find_loop:
        cmp rcx,0
-       je p_find_done
+       je p_find_notfound
        cmp rbx,qword [rcx+16]  ; compare lengths
        jne p_find_nextword
-       push rcx
+       push rcx                ; save tfa for later
        ;; check word
        push rax
        tfa2pname rcx
@@ -119,18 +119,18 @@ p_find_loop:
        push rbx
        DOFORTH p_strncmp
        pop rax                 ; return value
-       pop rcx
+       pop rcx                 ; restore tfa
        cmp rax,0
-       je p_find_done
+       je p_find_found
        mov rbx,[rsp]
        mov rax,[rsp+8]
 p_find_nextword:
        mov rcx,[rcx]
        jmp p_find_loop
+p_find_notfound:
+       xor rcx,rcx
 p_find_found:
-       mov qword [rsp+8],rcx   ; replace chars with tfa
-       mov rcx,1
-p_find_done:
-       push rcx
+       add rsp,8
+       mov qword [rsp],rcx     ; replace with tfa / 0
        popr rsi
        next