added TFA>FLAGS@

[rrq/rrqforth.git] / rrqforth.asm

diff --git a/rrqforth.asm b/rrqforth.asm
index da94d056d7ca7da435815ab01f465ab39b64e380..7c1b5ca1ed314decfdfb7dbec0176ca2eecb40fb 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'
 
 ;;; ========================================
@@ -176,18 +183,49 @@ include 'stdio.asm'
 include 'compile.asm'
 
        WORD p_program_version,'PROGRAM_VERSION',dostring
-       STRING 'RRQ Forth version 0.1 - 2021-05-13',10
+       STRING 'RRQ Forth version 0.1 - 2021-05-22',10
 
        WORD p_stdin,'STDIN',dovalue
        ;; Initialised to hold a STREAM for fd 0
        dq 0
 
-;;; The main entry point.
+       WORD p_args,'ARGS',dostring
+       ;; Pointer to initial argument block
+       dq 0       ; *(int argc,(char*[argc]) argv)
+
+       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
        ;; QUIT is the program entry point ********************
-main:
+
        mov rsp,DS_TOP
        mov rbp,RS_TOP
        cmp qword [p_stdin_DFA],0
@@ -204,8 +242,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