From: Ralph Ronnquist Date: Sun, 23 May 2021 14:49:18 +0000 (+1000) Subject: add " and STREAM-NCHARS X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=4b8c6ee71a5bf95c1374bf45aa6d64bf42c81551;p=rrq%2Frrqforth.git add " and STREAM-NCHARS --- diff --git a/stdio.asm b/stdio.asm index a6cf512..e7cb02c 100644 --- a/stdio.asm +++ b/stdio.asm @@ -77,7 +77,37 @@ p_stream_MEM: mov rbx,qword [rax+16] ; copy fill mov qword [rax+24],rbx ; into current next - + + WORD p_stream_nchars,'STREAM-NCHARS',fasm + ;; ( stream -- n ) + ;; Scan over whitespace in the stream buffer (without actually + ;; consuming) and tell how much then remains. + pushr rsi + mov rcx,qword [rsp] + mov rbx,qword [rcx+16] ; fill + sub rbx,qword [rcx+24] ; current + cmp qword [rcx+8],-1 + je p_stream_nchars_memblock + mov rsi,rcx + add rsi,32 + jmp p_stream_nchars_skipblanks +p_stream_nchars_memblock: + mov rsi,qword [rcx] +p_stream_nchars_skipblanks: + add rsi,qword [rcx+24] ; + cmp rbx,0 + je p_stream_nchars_done +p_stream_nchars_loop: + lodsb + cmp al,32 + jg p_stream_nchars_done + dec rbx + jg p_stream_nchars_loop +p_stream_nchars_done: + mov qword [rsp],rbx + popr rsi + next + ;;; ======================================== ;;; Stream reading ;;; READ-STREAM-CHAR ( stream -- ch ) @@ -86,10 +116,10 @@ p_stream_MEM: ;; ( stream -- ch ) pushr rsi mov rax,qword [rsp] - mov rbx,[rax+16] ; fill + mov rbx,qword [rax+16] ; fill p_read_stream_char.READ: - mov rcx,[rax+24] ; current + mov rcx,qword [rax+24] ; current cmp rbx,rcx jg p_read_stream_char.CHAR @@ -173,6 +203,29 @@ p_read_word_nomore: popr rsi next + WORD p_double_quote,'"',fasm ;; " (fool emacs) + ;; ( -- char* n ) + ;; Scan to double quote in stream buffer, putting thr string on PAD + pushr rsi + push p_pad_DFA + push 0 +p_double_quote_loop: + DOFORTH p_stdin, p_read_stream_char + pop rax + cmp rax,0 + jl p_double_quote_endstream + cmp rax,'"' ; " (fool emacs) + je p_double_quote_endquote + lea rdi,[p_pad_DFA] + add rdi,qword [rsp] + stosb + inc qword [rsp] + jmp p_double_quote_loop +p_double_quote_endquote: +p_double_quote_endstream: + popr rsi + next + WORD p_tell,'TELL',fasm ;; ( chars* n -- ) ;; Write n bytes from chars* to stdout