Moving the debug trace point to be prior to advancing %rsi

[rrq/rrqforth.git] / stdio.asm

diff --git a/stdio.asm b/stdio.asm
index e7cb02c610b99cce131c9ea8469d53f96f169489..191e09893e2226146f1ee1d0b92a0650d66ec06d 100644 (file)
--- 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.
 ;;;
@@ -205,12 +214,14 @@ p_read_word_nomore:
 
        WORD p_double_quote,'"',fasm ;; " (fool emacs)
        ;; ( -- char* n )
-       ;; Scan to double quote in stream buffer, putting thr string on PAD
+       ;; 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_stdin, p_read_stream_char
+       DOFORTH p_input, p_get, p_read_stream_char
        pop rax
        cmp rax,0
        jl p_double_quote_endstream
@@ -223,6 +234,14 @@ p_double_quote_loop:
        jmp p_double_quote_loop
 p_double_quote_endquote:
 p_double_quote_endstream:
+       lea rdi,[p_pad_DFA]
+       add rdi,qword [rsp]
+       stosb
+       ;; 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
 
@@ -262,7 +281,7 @@ p_double_quote_endstream:
        WORD p_sp,'SP',dovalue
        ;; ( -- c )
        ;; Pushes a space character on the stack
-       dq 10
+       dq 32
 
        WORD p_digits,'DIGITS',dovariable
        db '0123456789abcdef'