upgrade
[rrq/rrqforth.git] / stdio.asm
index dd559c69ff50888dca88690a0390a5941b3f0e57..99bac9eb290532001312dcf7fb3db975de493c49 100644 (file)
--- a/stdio.asm
+++ b/stdio.asm
@@ -206,12 +206,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 +220,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 +233,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,33 +278,32 @@ 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]
-       add qword [rsp+8],8     ; adjust pointer
        popr rsi
        next
 
        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 )
@@ -312,32 +318,46 @@ p_double_quote_endstream:
        WORD p_digits,'DIGITS',dovariable
        db '0123456789abcdef'
 
-       WORD p_dot,'.',fasm
+       WORD p_dot_temp,'.TEMP',fasm
        ;; ( v -- )
        ;; Print TOP value as unsigned BASE integer
        pushr rsi
-       mov rax,qword [rsp]
+       mov rdi,p_pad_DFA
+       pop rax
        cmp rax,0
        jge p_dot_positive
        cmp qword [p_base_DFA],10
        jne p_dot_positive
-       push '-'
-       DOFORTH p_emit
-       mov rax,qword [rsp]
+       mov byte[rdi],'-'
+       inc rdi
        neg rax
 p_dot_positive:
+       call p_dot_pad_subr
+       xor rax,rax
+       stosb
+       push p_pad_DFA
+       sub rdi,p_pad_DFA
+       push rdi
+       DOFORTH p_str2temp
+       dec qword [rsp] ; don't count the ending NUL
+       popr rsi
+       next
+
+p_dot_pad_subr: ; 
        xor rdx,rdx
        div qword [p_base_DFA]  ; rdx:rax / BASE => q=rax, r=rdx
-       mov qword [rsp],rdx 
        cmp rax,0
        je p_dot_remainder
-       push rax
-       DOFORTH p_dot
-p_dot_remainder:
+       push rdx
+       call p_dot_pad_subr
        pop rdx
+p_dot_remainder:
        xor rax,rax
        mov al,[p_digits_DFA+rdx]
-       push rax
-       DOFORTH p_emit
-       popr rsi
-       next
+       stosb
+       ret
+
+       WORD p_dot,'.'
+       ;; ( v -- )
+       ;; Print value to stdout
+       dq p_dot_temp, p_literal,1, p_fdtell, p_return