add INPUT variable for current eval stream

[rrq/rrqforth.git] / rrqforth.asm

diff --git a/rrqforth.asm b/rrqforth.asm
index 5d360306df30648ac9d94d9d5a9618dd5b85a096..f0ef63a248c087fb61bb38474fbe5faabbd0d879 100644 (file)
--- a/rrqforth.asm
+++ b/rrqforth.asm
@@ -73,7 +73,7 @@ dostring:
        pushpname rax
        next
 
-       WORD p_calltrace,'calltrace',dovalue
+       WORD p_calltrace,'[calltrace]',dovalue
        ;; Common call point for debugging
        ;; rax = cfa of called word
        ;; rsi = cell* of next forth word
@@ -106,6 +106,8 @@ DS_TOP:                             ; The initial rsp
 
        ;segment readable executable
 
+include 'signals.asm'
+
 ;;; At fasm compilation: reset previous_word to make a new word list
 ;;; Words above belong to the SYSTEM wordlist, and the following
 ;;; belong to the FORTH wordlist.
@@ -168,14 +170,18 @@ 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)
 
+       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
+       DOFORTH  p_input, p_get, p_read_word
        pop rax
        pop rbx
        cmp rax,0 ; end of stream
@@ -194,17 +200,48 @@ p_lparen_exit:
        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
+       mov rbp,RS_TOP
+       call p_setup_signals_DFA
+       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
        ;; QUIT is the program entry point ********************
-
        mov rsp,DS_TOP
        mov rbp,RS_TOP
        cmp qword [p_stdin_DFA],0
@@ -216,12 +253,15 @@ last_forth_word:
        pop qword [p_stdin_DFA] ; Assign STDIN
 
 p_quit_INITIALIZED:
-       ;; Initial blurb
+       ;; Setup INPUT from STDIN
        FORTH
+       dq p_verboseQ
+       dq p_get
+       BRANCH 0,p_quit_EVAL
        dq p_program_version
        dq p_tell
-       dq p_stdin
-       dq p_evaluate_stream
+p_quit_EVAL:
+       dq p_stdin, p_evaluate_stream
        BRANCH 0,p_quit_ERROR
        dq p_false
        dq sys_exit
@@ -237,7 +277,7 @@ p_quit_ERROR:
        dq p_tell
        ENDFORTH
        mov rbp,RS_TOP          ; reset the return stack
-       jmp main
+       jmp p_quit_INITIALIZED
 
 ;;; ========================================