X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=rrqforth.asm;h=f0ef63a248c087fb61bb38474fbe5faabbd0d879;hb=97a4e5ecb1623dbe0fbd7b6eeb96e966c6c5b1d3;hp=dc377747755b342a8ff8cd1e49f8bb16a165531b;hpb=6feac19e9a7e003a0f47890bf39a9a8324697e4b;p=rrq%2Frrqforth.git

diff --git a/rrqforth.asm b/rrqforth.asm
index dc37774..f0ef63a 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
@@ -181,7 +181,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
@@ -242,7 +242,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 +253,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 +261,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