X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=stdio.asm;h=3f69cd3b1c42bcdef0a0dc294902a84b789851d5;hb=4dcbbfcdec1f956b9fe016b4e742f8c57837ab2c;hp=a6cf5128683ce1f121855560ec4e181ed837f2c9;hpb=5e1475bc1afeecd3bd9388cac34d937ea67c2a68;p=rrq%2Frrqforth.git

diff --git a/stdio.asm b/stdio.asm
index a6cf512..3f69cd3 100644
--- a/stdio.asm
+++ b/stdio.asm
@@ -2,20 +2,29 @@
 ;;; Dynamic memory management. Allocated with MALLOC and released with
 ;;; MUNMAP (see below)
 
-	;; ( size -- addr )
-	;; Allocates memory (using brk)
 	WORD p_malloc,'MALLOC',fasm
+	;; ( size -- addr )
+	;; Allocates memory (using mmap)
 	pushr rsi		; pretend it's a FORTH word since it
 				; ends via sys_mmap_asm
 	pop rax
 	push qword 0		; address of mapping (suggestion)
 	push rax		; length of mapping
 	push qword 3		; protection mode PROT_READ | PROT_WRITE
-	push qword 8226		; flags PRIVATE | ANONYMOUS | LOCKED
+	push qword 34		; flags PRIVATE | ANONYMOUS 
 	push qword -1		; fd -1
 	push qword 0		; offset
 	jmp sys_mmap_asm	; exit via sys_mmap
 
+	WORD p_realloc,'REALLOC',fasm
+	;; ( addr old new -- )
+	;; Try remapping a given MMAP region of old size to a new size
+	;; mremap(void *old_address, size_t old_size,
+        ;;        size_t new_size, int flags, ... /* void *new_address */);
+	pushr rsi
+	push 1			; MREMAP_MAYMOVE
+	jmp sys_mmap_asm        ; exit via sys_mmap
+
 ;;; ========================================
 ;;; Input stream handling.
 ;;;
@@ -77,7 +86,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 +125,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 +212,39 @@ p_read_word_nomore:
 	popr rsi
 	next
 
+	WORD p_double_quote,'"',fasm ;; " (fool emacs)
+	;; ( -- char* n )
+	;; Scan to double quote in stream buffer, putting the string
+	;; on PAD, plus an extra NUL, then copy that into a new temp
+	;; object, but exclude the NUL from the returned count, n.
+	pushr rsi
+	push p_pad_DFA
+	push 0
+p_double_quote_loop:	
+	DOFORTH p_input, p_get, 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:
+	mov qword [rdi],0
+	lea rdi,[p_pad_DFA]
+	add rdi,qword [rsp]
+	;; copy PAD string 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_tell,'TELL',fasm
 	;; ( chars* n -- )
 	;; Write n bytes from chars* to stdout
@@ -209,7 +281,7 @@ p_read_word_nomore:
 	WORD p_sp,'SP',dovalue
 	;; ( -- c )
 	;; Pushes a space character on the stack
-	dq 10
+	dq 32
 
 	WORD p_digits,'DIGITS',dovariable
 	db '0123456789abcdef'