fixing inveresed logic

[rrq/rrqforth.git] / rrqforth.asm

diff --git a/rrqforth.asm b/rrqforth.asm
index ecea1171612a82f840f91d82ce44931432805576..f5d6269191cdce57edef6f335b440c0fce4c75f9 100644 (file)
--- a/rrqforth.asm
+++ b/rrqforth.asm
@@ -126,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
@@ -148,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'
@@ -189,17 +168,72 @@ include 'compile.asm'
        ;; Initialised to hold a STREAM for fd 0
        dq 0
 
-       WORD p_args,'ARGS',dostring
+       WORD p_args,'MAIN-ARGS',dovalue
        ;; Pointer to initial argument block
        dq 0       ; *(int argc,(char*[argc]) argv)
 
-;;; The main entry point.
+       WORD p_verboseQ,'VERBOSE?',dovariable
+       ;; Flags whether the running is in verbose mode ot not
+       dq 0       ; 
+
+       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. ********
+;;; This could be set up as a WORD but it isn't
+
 main:  
        ;; Initial rsp points to the arguments block of size (64 bits)
        ;; followed by the argument pointers.
        mov qword [p_args_DFA],rsp
+       call main_is_verbose
+       mov qword [p_verboseQ_DFA],rdx
        jmp p_quit_DFA          ; QUIT
 
+       ;; Subroutine to check the command line for a "-v"
+       ;; return boolean in rdx
+       ;; implementation for that 2 byte asciiz string
+main_is_verbose_data:
+       db '-v',0
+
+main_is_verbose:
+       mov rbx,qword [p_args_DFA] ; Pointer to main arguments
+       mov r8,qword [rbx]         ; r8 = count of pointers
+       xor rdx,rdx
+       cld
+main_is_verbose_next:
+       dec r8
+       jl main_is_not_verbose
+       add rbx,8
+       mov rsi,qword [rbx]
+       mov rdi,main_is_verbose_data
+main_is_verbose_loop:
+       cmpsb
+       jne main_is_verbose_next
+       cmp byte[rsi-1],0
+       jne main_is_verbose_loop
+       not rdx
+main_is_not_verbose:
+       ret
+
 ;;; This word is also the last word before syscalls
 last_forth_word:
        WORD p_quit,'QUIT',fasm
@@ -218,8 +252,12 @@ last_forth_word:
 p_quit_INITIALIZED:
        ;; Initial blurb
        FORTH
+       dq p_verboseQ
+       dq p_get
+       BRANCH 0,p_quit_EVAL
        dq p_program_version
        dq p_tell
+p_quit_EVAL:
        dq p_stdin
        dq p_evaluate_stream
        BRANCH 0,p_quit_ERROR