;; 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 rax
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
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
- 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
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:
- DOFORTH p_dup, p_read_stream_char
+ DOFORTH p_Rget, p_read_stream_char
pop rbx
cmp bl,0
jl p_read_word_nomore
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]
- add qword [rsp+8],8 ; adjust pointer
popr rsi
next
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
- 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
- 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
- dq p_literal,1, p_fdemit, p_exit
+ dq p_literal,1, p_fdemit, p_return
WORD p_nl,'NL',dovalue
;; ( -- c )
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