X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=compile.asm;h=8e87bf87012e2403217c7aa8e29963c79a41f70f;hb=f0b6d5b7831eff95b587bff49e5069e94503fb5c;hp=6ddf3a3387b916450ccf72ca5963ca0a75199580;hpb=66382e2941c3b774bb04cd27954258a50b1c402a;p=rrq%2Frrqforth.git

diff --git a/compile.asm b/compile.asm
index 6ddf3a3..8e87bf8 100644
--- a/compile.asm
+++ b/compile.asm
@@ -30,7 +30,6 @@ p_create_COPY:
 	mov qword [rdi],0	; OFF
 	add rdi,8
 	mov qword [rbx+8],rdi	; pCFA
-	add rdi,8
 	mov qword [rdi],dovariable ; CFA
 	add rdi,8
 	mov qword [p_here_DFA],rdi ; allocate the space
@@ -46,7 +45,7 @@ p_create_COPY:
 	add qword [p_here_DFA],rax
 	next
 	
-	WORD p_quote,"'",fasm,IMMEDIATE
+	WORD p_quote,"'",fasm
 	;; ( "word" -- cfa )
 	;; Find the following word and push its cfa, or 0
 	pushr rsi
@@ -108,7 +107,7 @@ p_quote_end:
 	mov qword [rax+8],dodoes
 	next
 
-	WORD p_literal,'LIT',fasm,IMMEDIATE
+	WORD p_literal,'LIT',fasm
 	;; ( -- v )
 	;; Push the value of successor cell onto stack, and skip it.
 	;; not for interactive use!!
@@ -116,10 +115,34 @@ p_quote_end:
 	add rsi,8
 	next
 
-	WORD p_literal_string,'S"',fasm ;; " (fool emacs)
+	WORD p_literal_string,'S"',fasm,IMMEDIATE ;; " (fool emacs)
 	;; ( -- char* n )
 	;; Save string on heap to make available at interpretation
 	;; not for interactive use!!
+	cmp qword [p_state_DFA],0
+	je p_literal_string_executing
+	pushr rsi
+	mov rdi,qword [p_here_DFA]
+	mov qword [rdi],p_literal_string
+	add rdi,8
+	mov qword [p_here_DFA],rdi
+	DOFORTH p_double_quote
+	pop rcx
+	pop rsi
+	mov rdi,qword [p_here_DFA]
+	mov qword [rdi],rcx
+	add rdi,8
+p_literal_string_copy:
+	dec rcx
+	jl p_literal_string_copied
+	movsb
+	jmp p_literal_string_copy
+p_literal_string_copied:
+	mov qword [p_here_DFA],rdi
+	popr rsi
+	next
+	
+p_literal_string_executing:
 	mov rax,qword [rsi]
 	add rsi,8
 	push rsi
@@ -225,7 +248,7 @@ p_numper_POSITIVE:
 	;; ( stream* -- *?* flag )
 	;; Execute the words from the given stream
 	;; returns 1 if stream ends and 0 if an unknown word is found
-	dq p_ltR		; Keep the stream on the return stack.
+	dq p_gtR		; Keep the stream on the return stack.
 p_evaluate_stream_PROMPT:
 	dq p_depth
 	dq p_dot
@@ -249,20 +272,27 @@ p_evaluate_stream_LOOP:
 	dq p_get
 	BRANCH 0,p_evaluate_stream_INTERPRET
 	dq p_dup
-	dq p_cfa2flags_get
-	dq p_literal, 1
+	dq p_tfa2flags_get
+	dq p_literal, 1 ; the immediate bit
 	dq p_and
-	dq p_not
-	BRANCH 0,p_evaluate_stream_INTERPRET
-	dq p_comma
-	BRANCH ,p_evaluate_stream_AFTER
+	BRANCH 0,p_evaluate_stream_COMPILE
 p_evaluate_stream_INTERPRET:
+	dq p_tfa2cfa
 	dq p_execute
 	BRANCH ,p_evaluate_stream_AFTER
+p_evaluate_stream_COMPILE:
+	dq p_tfa2cfa
+	dq p_comma
+	BRANCH ,p_evaluate_stream_AFTER
 p_evaluate_stream_NOTWORD:
 	dq p_drop
 	dq p_number
 	BRANCH 0,p_evaluate_stream_BAD ; branch if 0
+	dq p_state
+	dq p_get
+	BRANCH 0,p_evaluate_stream_AFTER ; branch if 0
+	dq p_literal, p_literal
+	dq p_comma, p_comma
 p_evaluate_stream_AFTER:
 	dq p_Rget
 	dq p_stream_nchars
@@ -289,9 +319,19 @@ p_evaluate_stream_BAD:
 	dq p_right_bracket
 	dq p_exit
 
-	WORD p_semicolon,';'
+	WORD p_semicolon,';',,IMMEDIATE
 	;; ( -- )
 	;; Lay out p_exit, and set interpreting mode
 	dq p_left_bracket
 	dq p_literal, p_exit
 	dq p_comma
+	dq p_left_bracket
+	dq p_exit
+
+	WORD p_immediate,'IMMEDIATE',fasm,IMMEDIATE
+	;; ( -- )
+	;; Set "immediate flag" of the word being defined
+	mov rax,qword [p_wordlist_DFA]
+	mov rax,qword [rax]	; tfa of most recent word
+	mov qword [rax+16],1	; set the flags field to 1
+	next