some new words

[rrq/rrqforth.git] / rrqforth.asm

diff --git a/rrqforth.asm b/rrqforth.asm
index 96b90837b5843ff0c3ee817b00c5d410e235144d..5187c902a06c7a202b08a4292bb98482d2a897e6 100644 (file)
--- a/rrqforth.asm
+++ b/rrqforth.asm
@@ -133,7 +133,12 @@ previous_word = 0
        pop rax
        jmp qword [rax]         ; goto code of that FORTH word (64 bit jump)
        
-       WORD p_exit, 'EXIT',fasm
+       WORD p_sysexit, 'EXIT',
+       ;; ( v -- )
+       ;; Terminate RRQFORTH with error code
+       dq sys_exit
+
+       WORD p_return, 'RETURN',fasm
        ;; ( -- ) ( R: addr -- )
        ;; Returns execution to the calling definition as per the
        ;; return stack.
@@ -165,7 +170,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 +195,7 @@ p_lparen_loop:
        cmp rax,1
        jne p_lparen_loop
        push rbx
-       push p_lbaren_rparen
+       push p_lparen_rparen
        push 1
        DOFORTH p_strncmp
        pop rax
@@ -199,7 +204,7 @@ p_lparen_loop:
 p_lparen_exit:
        popr rsi
        next
-p_lbaren_rparen: db ')',0
+p_lparen_rparen: db ')',0
 
 ;;; ******** The main entry point. ********
 ;;; This could be set up as a WORD but it isn't
@@ -240,6 +245,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
@@ -253,6 +291,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