projects
/
rrq
/
rrqforth.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug fix for double quote
[rrq/rrqforth.git]
/
stdio.asm
diff --git
a/stdio.asm
b/stdio.asm
index dd559c69ff50888dca88690a0390a5941b3f0e57..549852e614058f97d49f63074ad0050c62626577 100644
(file)
--- a/
stdio.asm
+++ b/
stdio.asm
@@
-275,7
+275,6
@@
p_double_quote_endstream:
inc qword [rsp]
DOFORTH p_str2temp
dec qword [rsp]
inc qword [rsp]
DOFORTH p_str2temp
dec qword [rsp]
- add qword [rsp+8],8 ; adjust pointer
popr rsi
next
popr rsi
next
@@
-312,32
+311,46
@@
p_double_quote_endstream:
WORD p_digits,'DIGITS',dovariable
db '0123456789abcdef'
WORD p_digits,'DIGITS',dovariable
db '0123456789abcdef'
- WORD p_dot
,'.
',fasm
+ WORD p_dot
_temp,'.TEMP
',fasm
;; ( v -- )
;; Print TOP value as unsigned BASE integer
pushr rsi
;; ( v -- )
;; Print TOP value as unsigned BASE integer
pushr rsi
- mov rax,qword [rsp]
+ mov rdi,p_pad_DFA
+ pop rax
cmp rax,0
jge p_dot_positive
cmp qword [p_base_DFA],10
jne p_dot_positive
cmp rax,0
jge p_dot_positive
cmp qword [p_base_DFA],10
jne p_dot_positive
- push '-'
- DOFORTH p_emit
- mov rax,qword [rsp]
+ mov byte[rdi],'-'
+ inc rdi
neg rax
p_dot_positive:
neg rax
p_dot_positive:
+ call p_dot_pad_subr
+ xor rax,rax
+ stosb
+ push p_pad_DFA
+ sub rdi,p_pad_DFA
+ push rdi
+ DOFORTH p_str2temp
+ dec qword [rsp] ; don't count the ending NUL
+ popr rsi
+ next
+
+p_dot_pad_subr: ;
xor rdx,rdx
div qword [p_base_DFA] ; rdx:rax / BASE => q=rax, r=rdx
xor rdx,rdx
div qword [p_base_DFA] ; rdx:rax / BASE => q=rax, r=rdx
- mov qword [rsp],rdx
cmp rax,0
je p_dot_remainder
cmp rax,0
je p_dot_remainder
- push rax
- DOFORTH p_dot
-p_dot_remainder:
+ push rdx
+ call p_dot_pad_subr
pop rdx
pop rdx
+p_dot_remainder:
xor rax,rax
mov al,[p_digits_DFA+rdx]
xor rax,rax
mov al,[p_digits_DFA+rdx]
- push rax
- DOFORTH p_emit
- popr rsi
- next
+ stosb
+ ret
+
+ WORD p_dot,'.'
+ ;; ( v -- )
+ ;; Print value to stdout
+ dq p_dot_temp, p_literal,1, p_fdtell, p_exit