X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=rrqforth.asm;h=96b90837b5843ff0c3ee817b00c5d410e235144d;hb=b49fed131d5a7806d0737bdc6f9b693c64753cf2;hp=f7f310af30754fd9f506a5ee51c1dc6f7b069853;hpb=bf67023324b2a0c5723dd3167ef757209ba62e01;p=rrq%2Frrqforth.git

diff --git a/rrqforth.asm b/rrqforth.asm
index f7f310a..96b9083 100644
--- 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.
@@ -159,6 +161,7 @@ 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
@@ -179,7 +182,7 @@ include 'compile.asm'
 	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
@@ -187,7 +190,7 @@ p_lparen_loop:
 	cmp rax,1
 	jne p_lparen_loop
 	push rbx
-	push qword ')'
+	push p_lbaren_rparen
 	push 1
 	DOFORTH p_strncmp
 	pop rax
@@ -196,7 +199,8 @@ p_lparen_loop:
 p_lparen_exit:
 	popr rsi
 	next
-	
+p_lbaren_rparen: db ')',0
+
 ;;; ******** The main entry point. ********
 ;;; This could be set up as a WORD but it isn't
 
@@ -204,6 +208,8 @@ 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
@@ -212,13 +218,11 @@ main:
 	;; return boolean in rdx
 	;; implementation for that 2 byte asciiz string
 main_is_verbose_data:
-	dq main_is_verbose_data_end - $	; length of data 
 	db '-v',0
-main_is_verbose_data_end:
 
 main_is_verbose:
 	mov rbx,qword [p_args_DFA] ; Pointer to main arguments
-	mov r8,qword [rbx]
+	mov r8,qword [rbx]	   ; r8 = count of pointers
 	xor rdx,rdx
 	cld
 main_is_verbose_next:
@@ -227,13 +231,11 @@ main_is_verbose_next:
 	add rbx,8
 	mov rsi,qword [rbx]
 	mov rdi,main_is_verbose_data
-	lodsq
-	mov rcx,rax
 main_is_verbose_loop:
 	cmpsb
 	jne main_is_verbose_next
-	dec rcx
-	jg main_is_verbose_loop
+	cmp byte[rsi-1],0
+	jne main_is_verbose_loop
 	not rdx
 main_is_not_verbose:
 	ret
@@ -242,7 +244,6 @@ main_is_not_verbose:
 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
@@ -254,7 +255,7 @@ 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
@@ -262,8 +263,7 @@ p_quit_INITIALIZED:
 	dq p_program_version
 	dq p_tell
 p_quit_EVAL:
-	dq p_stdin
-	dq p_evaluate_stream
+	dq p_stdin, p_evaluate_stream
 	BRANCH 0,p_quit_ERROR
 	dq p_false
 	dq sys_exit
@@ -279,7 +279,7 @@ p_quit_ERROR:
 	dq p_tell
 	ENDFORTH
 	mov rbp,RS_TOP		; reset the return stack
-	jmp main
+	jmp p_quit_INITIALIZED
 
 ;;; ========================================