X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=rrqforth.asm;h=dc377747755b342a8ff8cd1e49f8bb16a165531b;hb=6feac19e9a7e003a0f47890bf39a9a8324697e4b;hp=5d360306df30648ac9d94d9d5a9618dd5b85a096;hpb=d5a8f559318ac57934871a48e964bac18557b601;p=rrq%2Frrqforth.git diff --git a/rrqforth.asm b/rrqforth.asm index 5d36030..dc37774 100644 --- a/rrqforth.asm +++ b/rrqforth.asm @@ -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,10 +170,14 @@ 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: @@ -194,12 +200,44 @@ 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 @@ -218,8 +256,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 @@ -237,7 +279,7 @@ p_quit_ERROR: dq p_tell ENDFORTH mov rbp,RS_TOP ; reset the return stack - jmp main + jmp p_quit_INITIALIZED ;;; ========================================