Apple-2gs-SW
/
ORCALib
mirror of https://github.com/byteworksinc/ORCALib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

printf: optimize hex and octal printing code. 

This also fixes a bug: printf("%#.0o\n", 0) should print "0", rather than nothing.
This commit is contained in:
Stephen Heumann 2023-04-17 19:36:45 -05:00
parent 80c0bbc32b
commit 67ae5f7b44
1 changed files with 32 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
stdio.asm
View File

@ -4566,53 +4566,46 @@ cn2a sta ~num
; ;
; Convert the number to an ASCII string ; Convert the number to an ASCII string
; ;
short I,M
ldy #l:~str-1 set up the character index ldy #l:~str-1 set up the character index
cn3 lda ~num+7 quit if the number is zero cn3 lda ~num+6 quit if the number is zero
ora ~num+6
ora ~num+5
ora ~num+4 ora ~num+4
ora ~num+3
ora ~num+2 ora ~num+2
ora ~num+1
ora ~num ora ~num
beq al1 beq al1
lda #0 roll off 3 bits lda #'0' roll off 3 bits
ldx #3 ldx #3
cn4 lsr ~num+7 cn4 lsr ~num+6
ror ~num+6
ror ~num+5
ror ~num+4 ror ~num+4
ror ~num+3
ror ~num+2 ror ~num+2
ror ~num+1
ror ~num ror ~num
ror A ror A
dex dex
bne cn4 bne cn4
lsr A form a character xba
lsr A asl A form a character
lsr A asl A
lsr A asl A
lsr A
ora #'0'
sta ~str,Y save the character
dey dey
ora #' '
sta ~str,Y save the character
bra cn3 bra cn3
; ;
; If a leading zero is required, be sure we include one ; If a leading zero is required, be sure we include one
; ;
al1 cpy #l:~str-1 include a zero if no characters have al1 lda ~altForm if alt form has been selected then
beq al2 been placed in the string beq al2
lda ~altForm branch if no leading zero is required lda ~precision make sure precision is non-zero
beq al3 bne al3
al2 lda #'0' inc ~precision
sta ~str,Y bra al3 include a zero in the string
al3 long I,M al2 cpy #l:~str-1 else if string has no characters then
bne al4
al3 lda #'0 ' include a zero in the string
sta ~str-1,Y
; ;
; Piggy back off of ~Format_d for output ; Piggy back off of ~Format_d for output
; ;
stz ~hexPrefix don't lead with 0x al4 stz ~hexPrefix don't lead with 0x
brl ~Format_IntOut brl ~Format_IntOut
end end
@ -4720,8 +4713,7 @@ argp equ 7 argument pointer
bra cn0 bra cn0
~Format_p entry ~Format_p entry
lda #1 inc ~isLong
sta ~isLong
~Format_X entry ~Format_X entry
stz ~orVal stz ~orVal
; ;
@ -4762,39 +4754,32 @@ cn2b stz ~hexPrefix assume we won't lead with 0x
; ;
; Convert the number to an ASCII string ; Convert the number to an ASCII string
; ;
short I,M
ldy #l:~str-1 set up the character index ldy #l:~str-1 set up the character index
cn3 lda #0 roll off 4 bits cn3 lda #'0' roll off 4 bits
ldx #4 ldx #4
cn4 lsr ~num+7 cn4 lsr ~num+6
ror ~num+6
ror ~num+5
ror ~num+4 ror ~num+4
ror ~num+3
ror ~num+2 ror ~num+2
ror ~num+1
ror ~num ror ~num
ror A ror A
dex dex
bne cn4 bne cn4
lsr A form a character xba form a character
lsr A
lsr A lsr A
lsr A lsr A
lsr A lsr A
ora #'0'
cmp #'9'+1 if the character should be alpha, cmp #'9'+1 if the character should be alpha,
blt cn5 adjust it blt cn5 adjust it
adc #6 adc #6
ora ~orVal ora ~orVal
cn5 sta ~str,Y save the character cn5 xba
dey dey
lda ~num+7 loop if the number is not zero ora #' '
ora ~num+6 sta ~str,Y save the character
ora ~num+5 lda ~num+6 loop if the number is not zero
ora ~num+4 ora ~num+4
ora ~num+3
ora ~num+2 ora ~num+2
ora ~num+1
ora ~num ora ~num
bne cn3 bne cn3
; ;
@ -4802,16 +4787,14 @@ cn5 sta ~str,Y save the character
; ;
lda ~altForm branch if no leading '0x' is required lda ~altForm branch if no leading '0x' is required
beq al3 beq al3
al2 lda #'X' insert leading '0x' lda #'0X' insert leading '0x'
ora ~orVal ora ~orVal
sta ~hexPrefix+1 xba
lda #'0'
sta ~hexPrefix sta ~hexPrefix
al3 long I,M
; ;
; Piggy back off of ~Format_d for output ; Piggy back off of ~Format_d for output
; ;
brl ~Format_IntOut al3 brl ~Format_IntOut
end end
**************************************************************** ****************************************************************