update

[rrq/rrqforth.git] / rrqforth.asm

diff --git a/rrqforth.asm b/rrqforth.asm
index ab4fd997cb32f85c2b1c767ea5945347ab369449..5d360306df30648ac9d94d9d5a9618dd5b85a096 100644 (file)
--- a/rrqforth.asm
+++ b/rrqforth.asm
@@ -73,6 +73,13 @@ dostring:
        pushpname rax
        next
 
+       WORD p_calltrace,'calltrace',dovalue
+       ;; Common call point for debugging
+       ;; rax = cfa of called word
+       ;; rsi = cell* of next forth word
+       ;; [$rsp] = from where the call was
+       ret
+
 include 'syscalls.asm'
 
 ;;; ========================================
@@ -119,10 +126,9 @@ previous_word = 0
        jmp qword rsi
 
        WORD p_execute,'EXECUTE',fasm
-       ;; ( tfa -- )
+       ;; ( cfa -- )
        ;; Execute the word
        pop rax
-       tfa2cfa rax
        jmp qword [rax]         ; goto code of that FORTH word (64 bit jump)
        
        WORD p_exit, 'EXIT',fasm
@@ -141,32 +147,12 @@ terminate_special:
        mov eax,60
        syscall
 
-       WORD p_branch,'BRANCH',fasm
-       ;; ( -- )
-       ;; Using subsequent inline cell as branch offset, branch
-       ;; accordingly
-       add rsi,qword [rsi]     
-       add rsi,8
-       next
-       
-       WORD p_zero_branch,'0BRANCH',fasm
-       ;; ( v -- )
-       ;; Using subsequent inline cell as branch offset, branch
-       ;; accordingly if the stacked value is zero, otherwise just
-       ;; skip over the branch offset
-       pop rax
-       cmp rax,0
-       jne p_zero_branch_SKIP
-       add rsi,qword [rsi]
-p_zero_branch_SKIP:
-       add rsi,8
-       next
-
 ;;; ========================================
 ;;; Core extension(s)
 
        ;segment readable writable executable
        
+include 'control.asm'
 include 'wordlists.asm'
 include 'memory.asm'
 include 'stack.asm'
@@ -186,13 +172,34 @@ include 'compile.asm'
        ;; Pointer to initial argument block
        dq 0       ; *(int argc,(char*[argc]) argv)
 
-;;; The main entry point.
+       WORD p_lparen,'(',fasm,IMMEDIATE
+       pushr rsi
+p_lparen_loop:
+       DOFORTH  p_stdin, p_read_word
+       pop rax
+       pop rbx
+       cmp rax,0 ; end of stream
+       je p_lparen_exit
+       cmp rax,1
+       jne p_lparen_loop
+       push rbx
+       push qword ')'
+       push 1
+       DOFORTH p_strncmp
+       pop rax
+       cmp rax,0
+       jne p_lparen_loop
+p_lparen_exit:
+       popr rsi
+       next
+       
+;;; ******** The main entry point. ********
 main:  
        ;; Initial rsp points to the arguments block of size (64 bits)
        ;; followed by the argument pointers.
        mov qword [p_args_DFA],rsp
        jmp p_quit_DFA          ; QUIT
-       
+
 ;;; This word is also the last word before syscalls
 last_forth_word:
        WORD p_quit,'QUIT',fasm
@@ -214,8 +221,6 @@ p_quit_INITIALIZED:
        dq p_program_version
        dq p_tell
        dq p_stdin
-       dq p_clear_stream
-       dq p_stdin
        dq p_evaluate_stream
        BRANCH 0,p_quit_ERROR
        dq p_false