make strncmp direction safe

[rrq/rrqforth.git] / stdio.asm

diff --git a/stdio.asm b/stdio.asm
index 549852e614058f97d49f63074ad0050c62626577..45a25f6f5dcc1d769ed5c260e4ffac4ed56008c6 100644 (file)
--- a/stdio.asm
+++ b/stdio.asm
@@ -147,6 +147,27 @@ p_stream_nchars_done:
        popr rsi
        next
 
+;;; ========================================
+;;; Copy line to PAD
+;;; READ-STREAM-LINE ( stream -- n )
+       
+       WORD p_read_stream_line,'READ-STREAM-LINE'
+       ;; ( stream -- n )
+       ;; Read stream until next newline
+       dq p_gtR, p_pad
+p_read_stream_line_loop:
+       dq p_Rget, p_read_stream_char
+       dq p_dup, p_0less
+       BRANCH 1,p_read_stream_line_done
+       dq p_dup, p_nl, p_equal
+       BRANCH 1,p_read_stream_line_done
+       dq p_over, p_Cput, p_literal,1, p_plus
+       BRANCH ,p_read_stream_line_loop
+p_read_stream_line_done:
+       dq p_drop, p_literal,0, p_over, p_Cput
+       dq p_pad, p_minus, p_Rgt, p_drop, p_return
+
+       
 ;;; ========================================
 ;;; Stream reading
 ;;; READ-STREAM-CHAR ( stream -- ch )
@@ -206,12 +227,12 @@ p_read_stream_char.CHAR:
        ;; Read next word from the given stream into the PAD
        pushr rsi
        pop rax
+       pushr rax ; the stream
        push qword p_pad_DFA
        push qword 0
-       push rax
 
 p_read_word_skipblanks:        
-       DOFORTH p_dup, p_read_stream_char
+       DOFORTH p_Rget, p_read_stream_char
        pop rbx
        cmp bl,0
        jl p_read_word_nomore
@@ -220,12 +241,12 @@ p_read_word_skipblanks:
        cmp bl,'#'
        je p_read_word_skipline
 p_read_word_readword:
-       ;; ( buffer length stream )
-       mov rax,qword [rsp+16]
-       mov rcx,qword [rsp+8]
+       ;; ( buffer length )
+       mov rax,qword [rsp+8]
+       mov rcx,qword [rsp]
        mov [rax+rcx],bl
-       inc qword [rsp+8]
-       DOFORTH p_dup, p_read_stream_char
+       inc qword [rsp]
+       DOFORTH p_Rget, p_read_stream_char ; ( -- buffer length char )
        pop rbx
        cmp bl,0
        jl p_read_word_nomore
@@ -233,12 +254,19 @@ p_read_word_readword:
        jg p_read_word_readword
 
 p_read_word_nomore:
-       pop rax
+       xor rbx,rbx
+       mov rax,qword [rsp+8]
+       mov rcx,qword [rsp]
+        mov [rax+rcx],bl ; add NUL ending
+       inc qword [rsp]
+       DOFORTH p_str2temp
+       dec qword [rsp]
+       popr rax
        popr rsi
        next
 
 p_read_word_skipline:
-       DOFORTH p_dup, p_read_stream_char
+       DOFORTH p_Rget, p_read_stream_char
        pop rbx
        cmp bl,0
        jl p_read_word_nomore
@@ -271,7 +299,7 @@ p_double_quote_endstream:
        lea rdi,[p_pad_DFA]
        add rdi,qword [rsp]
        mov byte [rdi],0
-       ;; copy PAD string into new temp object
+       ;; copy PAD string + NUL into new temp object
        inc qword [rsp]
        DOFORTH p_str2temp
        dec qword [rsp]
@@ -281,22 +309,22 @@ p_double_quote_endstream:
        WORD p_fdtell,'FDTELL',
        ;; ( chars* n fd -- )
        ;; Write n bytes from chars* to fd
-       dq p_rot, p_rot, sys_write, p_drop, p_exit
+       dq p_rot, p_rot, sys_write, p_drop, p_return
        
        WORD p_tell,'TELL'
        ;; ( chars* n -- )
        ;; Write n bytes from chars* to stdout
-       dq p_literal,1,p_fdtell, p_exit
+       dq p_literal,1,p_fdtell, p_return
 
        WORD p_fdemit,'FDEMIT'
        ;; ( c fd -- )
        ;; Write byte to fd
-       dq p_literal,1, p_dsp, p_literal,1, sys_write, p_2drop, p_exit
+       dq p_literal,1, p_dsp, p_literal,1, sys_write, p_2drop, p_return
        
        WORD p_emit,'EMIT'
        ;; ( c -- )
        ;; Write byte to stdout
-       dq p_literal,1, p_fdemit, p_exit
+       dq p_literal,1, p_fdemit, p_return
 
        WORD p_nl,'NL',dovalue
        ;; ( -- c )
@@ -353,4 +381,4 @@ p_dot_remainder:
        WORD p_dot,'.'
        ;; ( v -- )
        ;; Print value to stdout
-       dq p_dot_temp, p_literal,1, p_fdtell, p_exit
+       dq p_dot_temp, p_literal,1, p_fdtell, p_return