fixup S" and LIT-STRING for forced NUL termination

[rrq/rrqforth.git] / compile.asm

diff --git a/compile.asm b/compile.asm
index 53dbaecdd9ddb233439e5931984a8bc1e8304883..ff5d853421005525e02035f3374abadc0a890390 100644 (file)
--- a/compile.asm
+++ b/compile.asm
@@ -18,7 +18,7 @@
        mov qword [rbx+24],rcx  ; PFA (length)
        pop rsi                 ; chars* (source)
        lea rdi,[rbx+32]        ; (dest)
-       ;; clear DF
+       cld
 p_create_COPY:
        movsb
        dec rcx
@@ -41,7 +41,7 @@ p_create_COPY:
        WORD p_allot,'ALLOT'
        ;; ( n -- )
        ;; Allocate n bytes on the heap
-       dq p_here, p_put_plus, p_exit
+       dq p_here, p_put_plus, p_return
        
        WORD p_quote,"'"
        ;; ( "word" -- cfa )
@@ -50,22 +50,22 @@ p_create_COPY:
        BRANCH 0,p_quote_end
        dq p_tfa2cfa
 p_quote_end:
-       dq p_exit
+       dq p_return
 
        WORD p_bracketed_quote,"[']",doforth,IMMEDIATE
        ;; Compilation ( "word" -- cfa )
        ;; Compile down " LIT value "
-       dq p_literal, p_literal, p_comma,p_quote, p_comma, p_exit
+       dq p_literal, p_literal, p_comma,p_quote, p_comma, p_return
 
        WORD p_comma,','
        ;; ( v -- )
        ;; Put cell value onto the heap and advance "HERE"
-       dq p_here, p_put, p_literal, 8, p_here, p_put_plus, p_exit
-       
+       dq p_here, p_literal, 8, p_get_n_increment, p_put, p_return
+
        WORD p_Ccomma,'C,'
        ;; ( c -- )
        ;; Put byte value onto the heap and advance "HERE"
-       dq p_here, p_Cput, p_literal, 1, p_here, p_put_plus, p_exit
+       dq p_here, p_Cput, p_literal, 1, p_here, p_put_plus, p_return
 
        WORD p_does,"DOES>",fasm,IMMEDIATE
        ;; ( -- )
@@ -89,12 +89,22 @@ p_quote_end:
        add rsi,8
        next
 
-       WORD p_literal_string,'S"',fasm,IMMEDIATE ;; " (fool emacs)
+       WORD p_literal_string,'LIT-STRING',fasm
        ;; ( -- 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
+       ;; Save NUL string length and pointer on heap to make
+       ;; available at interpretation. Not for interactive use!!
+       mov rax,qword [rsi]
+       add rsi,8
+       push rsi
+       add rsi,rax
+       dec rax
+       push rax
+       next
+
+
+       WORD p_literal_string_compile,'S"',fasm,IMMEDIATE ;; " (fool emacs)
+       ;; ( "..." -- )
+       ;; Lay out a LIT-STRING and a NUL string with length
        pushr rsi
        mov rdi,qword [p_here_DFA]
        mov qword [rdi],p_literal_string
@@ -103,9 +113,11 @@ p_quote_end:
        DOFORTH p_double_quote
        pop rcx
        pop rsi
+       inc rcx                 ; include the terminating NUL in count
        mov rdi,qword [p_here_DFA]
        mov qword [rdi],rcx
        add rdi,8
+       cld
 p_literal_string_copy:
        dec rcx
        jl p_literal_string_copied
@@ -116,14 +128,6 @@ p_literal_string_copied:
        popr rsi
        next
        
-p_literal_string_executing:
-       mov rax,qword [rsi]
-       add rsi,8
-       push rsi
-       push rax
-       add rsi,rax
-       next
-
        WORD p_state,'STATE',dovariable
        ;; Interpretation state (0=interpreting, 1=compiling)
        dq 0
@@ -193,6 +197,8 @@ p_number_ALPHA:
        cmp al,'Z'
        jg p_number_alpha
        sub al,'A'-10
+       cmp rax,qword [p_base_DFA]
+       jge p_number_BAD
        jmp p_number_CONSUME
 p_number_alpha:
        cmp al,'a'
@@ -200,6 +206,8 @@ p_number_alpha:
        cmp al,'z'
        jg p_number_BAD
        sub al,'a'-10
+       cmp rax,qword [p_base_DFA]
+       jge p_number_BAD
        jmp p_number_CONSUME
 p_number_BAD:
        push qword 0
@@ -282,7 +290,8 @@ p_evaluate_stream_END:
        dq p_literal, 1
 p_evaluate_stream_BAD:
        dq p_Rgt, p_input, p_put ; restore previous stream
-       dq p_exit
+       dq p_literal,0, p_state, p_put ; set interactive mode
+       dq p_return
 
        WORD p_colon,':'
        ;; ( -- )
@@ -295,12 +304,12 @@ p_evaluate_stream_BAD:
        dq p_tfa2cfa
        dq p_put
        dq p_right_bracket
-       dq p_exit
+       dq p_return
 
        WORD p_semicolon,';',,IMMEDIATE
        ;; ( -- )
-       ;; Lay out p_exit, and set interpreting mode
-       dq p_literal, p_exit, p_comma, p_left_bracket, p_exit
+       ;; Lay out p_return, and set interpreting mode
+       dq p_literal, p_return, p_comma, p_left_bracket, p_return
 
        WORD p_immediate,'IMMEDIATE',fasm,IMMEDIATE
        ;; ( -- )
@@ -316,9 +325,10 @@ p_evaluate_stream_BAD:
        dq 15000
        
        WORD p_open_file,'OPEN-FILE',fasm
-       ;; ( chaz* -- fd )
+       ;; ( chaz* n -- fd )
        ;; Open the nominated file
        pushr rsi
+       add rsp,8 ; drop n ... assuming NUL-ended string
        push qword 0
        push qword 0
        DOFORTH sys_open
@@ -326,7 +336,7 @@ p_evaluate_stream_BAD:
        next
 
        WORD p_load_file,'LOAD-FILE'
-       ;; ( chaz* -- )
+       ;; ( chaz* n -- )
        dq p_open_file
        dq p_dup, p_0less
        BRANCH 1,p_load_file_badfile
@@ -341,4 +351,4 @@ p_load_file_badfile:
        dq p_tell, p_dot, p_nl, p_emit
        dq p_literal,1
 p_load_file_exit:
-       dq p_exit
+       dq p_return