X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=rrqforth.asm;h=894e4b440bcb5e2d890020dd87a2577e7890aa9d;hb=036306101f72c2f8033c4422abcb1436f0bde97e;hp=b06fed1062ced657472f3362bc9071ed14d897e1;hpb=42844a6fe395162a374bd7bb6e8ed9a04b8d580c;p=rrq%2Frrqforth.git diff --git a/rrqforth.asm b/rrqforth.asm index b06fed1..894e4b4 100644 --- a/rrqforth.asm +++ b/rrqforth.asm @@ -165,7 +165,7 @@ include 'temp.asm' include 'compile.asm' WORD p_program_version,'PROGRAM_VERSION',dostring - STRING 'RRQ Forth version 0.1 - 2021-05-22',10 + STRING 'RRQ Forth version 0.1 - 2021-06-05',10 WORD p_stdin,'STDIN',dovalue ;; Initialised to hold a STREAM for fd 0 @@ -190,7 +190,7 @@ p_lparen_loop: cmp rax,1 jne p_lparen_loop push rbx - push qword ')' + push p_lparen_rparen push 1 DOFORTH p_strncmp pop rax @@ -199,7 +199,8 @@ p_lparen_loop: p_lparen_exit: popr rsi next - +p_lparen_rparen: db ')',0 + ;;; ******** The main entry point. ******** ;;; This could be set up as a WORD but it isn't @@ -239,6 +240,39 @@ main_is_verbose_loop: main_is_not_verbose: ret + WORD p_process_args_var,'PROCESS-ARGS-VAR',dovariable + ;; ( -- a ) + ;; Two cells for iterating and load the main args +p_process_args_ptr: dq 0 +p_process_args_end: dq 0 + + WORD p_process_args,'PROCESS-ARGS',fasm + pushr rsi + mov rax,qword [p_args_DFA] ; args* + mov rbx,qword [rax] ; count + shl rbx,3 + add rax,8 + add rbx,rax ; end + mov qword [p_process_args_end],rbx + add rax,8 + mov qword [p_process_args_ptr],rax +p_process_args_loop: + mov rax,qword [p_process_args_ptr] + cmp rax,qword [p_process_args_end] + jge p_process_args_done + add qword [p_process_args_ptr],8 + mov rax,qword [rax] + mov bl,[rax] + cmp bl,'-' + je p_process_args_loop + push rax + push rax + DOFORTH p_strlen, p_load_file, p_drop + jmp p_process_args_loop +p_process_args_done: + popr rsi + next + ;;; This word is also the last word before syscalls last_forth_word: WORD p_quit,'QUIT',fasm @@ -252,6 +286,7 @@ last_forth_word: push 10000 DOFORTH p_stream pop qword [p_stdin_DFA] ; Assign STDIN + DOFORTH p_process_args p_quit_INITIALIZED: ;; Setup INPUT from STDIN