projects
/
rrq
/
rrqforth.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixup S" and LIT-STRING for forced NUL termination
[rrq/rrqforth.git]
/
stdio.asm
diff --git
a/stdio.asm
b/stdio.asm
index 549852e614058f97d49f63074ad0050c62626577..99bac9eb290532001312dcf7fb3db975de493c49 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,12
+233,19
@@
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
p_read_word_skipline:
popr rsi
next
p_read_word_skipline:
- 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
@@
-271,7
+278,7
@@
p_double_quote_endstream:
lea rdi,[p_pad_DFA]
add rdi,qword [rsp]
mov byte [rdi],0
lea rdi,[p_pad_DFA]
add rdi,qword [rsp]
mov byte [rdi],0
- ;; copy PAD string into new temp object
+ ;; copy PAD string
+ NUL
into new temp object
inc qword [rsp]
DOFORTH p_str2temp
dec qword [rsp]
inc qword [rsp]
DOFORTH p_str2temp
dec qword [rsp]
@@
-281,22
+288,22
@@
p_double_quote_endstream:
WORD p_fdtell,'FDTELL',
;; ( chars* n fd -- )
;; Write n bytes from chars* to fd
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
+ dq p_rot, p_rot, sys_write, p_drop, p_
return
WORD p_tell,'TELL'
;; ( chars* n -- )
;; Write n bytes from chars* to stdout
WORD p_tell,'TELL'
;; ( chars* n -- )
;; Write n bytes from chars* to stdout
- dq p_literal,1,p_fdtell, p_
exit
+ dq p_literal,1,p_fdtell, p_
return
WORD p_fdemit,'FDEMIT'
;; ( c fd -- )
;; Write byte to fd
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
+ dq p_literal,1, p_dsp, p_literal,1, sys_write, p_2drop, p_
return
WORD p_emit,'EMIT'
;; ( c -- )
;; Write byte to stdout
WORD p_emit,'EMIT'
;; ( c -- )
;; Write byte to stdout
- dq p_literal,1, p_fdemit, p_
exit
+ dq p_literal,1, p_fdemit, p_
return
WORD p_nl,'NL',dovalue
;; ( -- c )
WORD p_nl,'NL',dovalue
;; ( -- c )
@@
-353,4
+360,4
@@
p_dot_remainder:
WORD p_dot,'.'
;; ( v -- )
;; Print value to stdout
WORD p_dot,'.'
;; ( v -- )
;; Print value to stdout
- dq p_dot_temp, p_literal,1, p_fdtell, p_
exit
+ dq p_dot_temp, p_literal,1, p_fdtell, p_
return