various improvements

[rrq/rrqforth.git] / stdio.asm

diff --git a/stdio.asm b/stdio.asm
index 3f69cd3b1c42bcdef0a0dc294902a84b789851d5..dd559c69ff50888dca88690a0390a5941b3f0e57 100644 (file)
--- a/stdio.asm
+++ b/stdio.asm
@@ -79,9 +79,39 @@ p_stream_MEM:
        push rax
        jmp exit
 
+       WORD p_unstream,'UNSTREAM',fasm
+       ;; ( stream -- )
+       ;; Release mmap-ed memory
+       pushr rsi
+       mov rax,qword [rsp]
+       mov rbx,qword [rax+8]
+       cmp rbx,0
+       jl p_unstream_incore
+       ;; unstream fd stream
+       push rbx
+       DOFORTH sys_close
+       pop rax
+       mov rax,qword [rsp]
+       push qword [rax+16]
+       add qword [rax+16],32
+       DOFORTH sys_munmap
+       pop rax
+       popr rsi
+       next
+p_unstream_incore:
+        mov rbx,qword [rax+16]
+       mov rax,qword [rax]
+       mov qword [rsp],rax
+       push rbx
+        DOFORTH        sys_munmap
+        pop rax
+        popr rsi
+        next
+
        WORD p_clear_stream,'CLEAR-STREAM',fasm
        ;; ( stream -- )
-       ;; Clear buffer of input stream
+       ;; "Clear" the stream by moving its "current position" to the
+       ;; "fill position".
        pop rax
        mov rbx,qword [rax+16]  ; copy fill
        mov qword [rax+24],rbx  ; into current
@@ -181,26 +211,21 @@ p_read_stream_char.CHAR:
        push rax
 
 p_read_word_skipblanks:        
-       FORTH
-       dq p_dup
-       dq p_read_stream_char
-       ENDFORTH
+       DOFORTH p_dup, p_read_stream_char
        pop rbx
        cmp bl,0
        jl p_read_word_nomore
        cmp bl,' '
        jle 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]
        mov [rax+rcx],bl
        inc qword [rsp+8]
-       FORTH
-       dq p_dup
-       dq p_read_stream_char
-       ENDFORTH
+       DOFORTH p_dup, p_read_stream_char
        pop rbx
        cmp bl,0
        jl p_read_word_nomore
@@ -212,6 +237,15 @@ p_read_word_nomore:
        popr rsi
        next
 
+p_read_word_skipline:
+       DOFORTH p_dup, p_read_stream_char
+       pop rbx
+       cmp bl,0
+       jl p_read_word_nomore
+       cmp bl,10 ; newline
+       je p_read_word_skipblanks
+       jmp p_read_word_skipline
+       
        WORD p_double_quote,'"',fasm ;; " (fool emacs)
        ;; ( -- char* n )
        ;; Scan to double quote in stream buffer, putting the string
@@ -234,9 +268,9 @@ p_double_quote_loop:
        jmp p_double_quote_loop
 p_double_quote_endquote:
 p_double_quote_endstream:
-       mov qword [rdi],0
        lea rdi,[p_pad_DFA]
        add rdi,qword [rsp]
+       mov byte [rdi],0
        ;; copy PAD string into new temp object
        inc qword [rsp]
        DOFORTH p_str2temp
@@ -245,33 +279,25 @@ p_double_quote_endstream:
        popr rsi
        next
 
-       WORD p_tell,'TELL',fasm
+       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
+       
+       WORD p_tell,'TELL'
        ;; ( chars* n -- )
        ;; Write n bytes from chars* to stdout
-       pushr rsi
-       pop rbx
-       pop rax
-       push 1
-       push rax
-       push rbx
-       DOFORTH sys_write
-       pop rax
-       popr rsi
-       next
+       dq p_literal,1,p_fdtell, p_exit
 
-       WORD p_emit,'EMIT',fasm
+       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
+       
+       WORD p_emit,'EMIT'
        ;; ( c -- )
        ;; Write byte to stdout
-       pushr rsi
-       mov rax,rsp
-       push 1
-       push rax
-       push 1
-       DOFORTH sys_write
-       pop rax                 ; ignore return value
-       pop rax                 ; drop input data
-        popr rsi
-       next
+       dq p_literal,1, p_fdemit, p_exit
 
        WORD p_nl,'NL',dovalue
        ;; ( -- c )