X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=rrqforth.asm;h=b06fed1062ced657472f3362bc9071ed14d897e1;hb=aa6d10c30115571b859b9e7e3d6e8a9b9ced599b;hp=da94d056d7ca7da435815ab01f465ab39b64e380;hpb=6a23dde51ebab1df2c43912b3f730f27e71b4d8f;p=rrq%2Frrqforth.git

diff --git a/rrqforth.asm b/rrqforth.asm
index da94d05..b06fed1 100644
--- a/rrqforth.asm
+++ b/rrqforth.asm
@@ -73,6 +73,13 @@ dostring:
 	pushpname rax
 	next
 
+	WORD p_calltrace,'[calltrace]',dovalue
+	;; Common call point for debugging
+	;; rax = cfa of called word
+	;; rsi = cell* of next forth word
+	;; [$rsp] = from where the call was
+	ret
+
 include 'syscalls.asm'
 
 ;;; ========================================
@@ -99,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.
@@ -119,10 +128,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
@@ -141,53 +149,100 @@ 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'
 include 'math.asm'
 include 'logic.asm'
 include 'stdio.asm'
+include 'temp.asm'
 include 'compile.asm'
 
 	WORD p_program_version,'PROGRAM_VERSION',dostring
-	STRING 'RRQ Forth version 0.1 - 2021-05-13',10
+	STRING 'RRQ Forth version 0.1 - 2021-05-22',10
 
 	WORD p_stdin,'STDIN',dovalue
 	;; Initialised to hold a STREAM for fd 0
 	dq 0
 
-;;; The main entry point.
+	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_input, p_get, 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
+	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 ********************
-main:
 	mov rsp,DS_TOP
 	mov rbp,RS_TOP
 	cmp qword [p_stdin_DFA],0
@@ -199,14 +254,15 @@ main:
 	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_clear_stream
-	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
@@ -222,7 +278,7 @@ p_quit_ERROR:
 	dq p_tell
 	ENDFORTH
 	mov rbp,RS_TOP		; reset the return stack
-	jmp main
+	jmp p_quit_INITIALIZED
 
 ;;; ========================================