projects
/
rrq
/
rrqforth.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed READ-WORD to use TEMPSPACE
[rrq/rrqforth.git]
/
stdio.asm
diff --git
a/stdio.asm
b/stdio.asm
index 549852e614058f97d49f63074ad0050c62626577..467952ba2f8a4b7f9716a3a2b3f22b69372ea7e4 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
;; 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 qword p_pad_DFA
push qword 0
- push rax
p_read_word_skipblanks:
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
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:
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
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
pop rbx
cmp bl,0
jl p_read_word_nomore
@@
-233,7
+233,14
@@
p_read_word_readword:
jg p_read_word_readword
p_read_word_nomore:
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
popr rsi
next