the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup and optimizations

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@504 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2000-12-01 09:36:57 +00:00
parent 81249b8d92
commit 047233fed2
1 changed files with 94 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
libsrc/common/_printf.s
View File

@@ -11,7 +11,7 @@
.import _ltoa, _ultoa .import _ltoa, _ultoa
.import _strlower, _strlen .import _strlower, _strlen
.import jmpvec .import jmpvec
.importzp sp, ptr1, ptr2, tmp1, regbank, sreg .importzp sp, ptr1, tmp1, regbank, sreg
.macpack generic .macpack generic
@@ -19,9 +19,14 @@
; We will store variables into the register bank in the zeropage. Define ; We will store variables into the register bank in the zeropage. Define
; equates for these variables. ; equates for these variables.
ArgList = regbank+0 ; Argument list pointer ArgList = regbank+0 ; Argument list pointer
Format = regbank+2 ; Format string Format = regbank+2 ; Format string
OutData = regbank+4 ; Function parameters OutData = regbank+4 ; Function parameters
; ----------------------------------------------------------------------------
; Other zero page cells
Base = ptr1
.code .code
@@ -55,7 +60,7 @@ Output1:
ldx #>CharArg ldx #>CharArg
jsr pushax jsr pushax
jsr push1 jsr push1
jmp (OutFunc) ; fout (OutData, &CharArg, 1) jmp (OutFunc) ; fout (OutData, &CharArg, 1)
; ---------------------------------------------------------------------------- ; ----------------------------------------------------------------------------
; Decrement the argument list pointer by 2 ; Decrement the argument list pointer by 2
@@ -108,53 +113,53 @@ GetIntArg:
lda (ArgList),y lda (ArgList),y
rts rts
; ----------------------------------------------------------------------------
; Add the a new digit in X to the value in ptr1. Does leave Y alone.
AddDigit:
txa ; Move digit into A
sub #'0' ; Make number from ascii digit
pha
lda ptr1
ldx ptr1+1
asl ptr1
rol ptr1+1 ; * 2
asl ptr1
rol ptr1+1 ; * 4
add ptr1
sta ptr1
txa
adc ptr1+1
sta ptr1+1 ; * 5
asl ptr1
rol ptr1+1 ; * 10
pla
add ptr1 ; Add digit value
sta ptr1
bcc @L1
inc ptr1+1
@L1: rts
; ---------------------------------------------------------------------------- ; ----------------------------------------------------------------------------
; Read an integer from the format string. Will return zero in Y. ; Read an integer from the format string. Will return zero in Y.
ReadInt: ReadInt:
ldy #0 ldy #0
sty ptr1 sty ptr1
sty ptr1+1 ; Start with zero sty ptr1+1 ; Start with zero
@L1: lda (Format),y ; Get format string character @Loop: lda (Format),y ; Get format string character
tax ; Format character --> X sub #'0' ; Make number from ascii digit
lda __ctype,x ; Get character classification bcc @L9 ; Jump if done
and #$04 ; Digit? cmp #9+1
beq @L9 ; Jump if done bcs @L9 ; Jump if done
jsr AddDigit ; Add the digit to ptr1
jsr IncFormatPtr ; Skip the character ; Skip the digit character
jmp @L1
jsr IncFormatPtr
; Add the digit to the value we have in ptr1
pha ; Save digit value
lda ptr1
ldx ptr1+1
asl ptr1
rol ptr1+1 ; * 2
asl ptr1
rol ptr1+1 ; * 4, assume carry clear
adc ptr1
sta ptr1
txa
adc ptr1+1
sta ptr1+1 ; * 5
asl ptr1
rol ptr1+1 ; * 10, assume carry clear
pla
adc ptr1 ; Add digit value
sta ptr1
bcc @Loop
inc ptr1+1
bcs @Loop ; Branch always
; We're done converting
@L9: lda ptr1 @L9: lda ptr1
ldx ptr1+1 ; Load result ldx ptr1+1 ; Load result
rts rts
; ---------------------------------------------------------------------------- ; ----------------------------------------------------------------------------
; Put a character into the argument buffer and increment the buffer index ; Put a character into the argument buffer and increment the buffer index
@@ -164,15 +169,15 @@ PutBuf: ldy BufIdx
rts rts
; ---------------------------------------------------------------------------- ; ----------------------------------------------------------------------------
; Get a pointer to the current buffer end ; Get a pointer to the current buffer end and push it onto the stack
GetBufPtr: PushBufPtr:
lda #<Buf lda #<Buf
ldx #>Buf ldx #>Buf
add BufIdx add BufIdx
bcc @L1 bcc @L1
inx inx
@L1: rts @L1: jmp pushax
; ---------------------------------------------------------------------------- ; ----------------------------------------------------------------------------
; Push OutData onto the software stack ; Push OutData onto the software stack
@@ -209,6 +214,26 @@ OutputArg:
jsr pushax jsr pushax
jmp (OutFunc) jmp (OutFunc)
; ----------------------------------------------------------------------------
; ltoa: Wrapper for _ltoa that pushes all arguments
ltoa: sty Base ; Save base
jsr pusheax ; Push value
jsr PushBufPtr ; Push the buffer pointer...
lda Base ; Restore base
jmp _ltoa ; ultoa (l, s, base);
; ----------------------------------------------------------------------------
; ultoa: Wrapper for _ultoa that pushes all arguments
ultoa: sty Base ; Save base
jsr pusheax ; Push value
jsr PushBufPtr ; Push the buffer pointer...
lda Base ; Restore base
jmp _ultoa ; ultoa (l, s, base);
; ---------------------------------------------------------------------------- ; ----------------------------------------------------------------------------
; ;
@@ -296,9 +321,8 @@ FormatSpec:
dex dex
bpl @L1 bpl @L1
; Start with reading the flags if there are any ; Start with reading the flags if there are any. X is $FF which is used
; for "true"
ldx #$FF ; "true" flag
ReadFlags: ReadFlags:
lda (Format),y ; Get next char... lda (Format),y ; Get next char...
@@ -414,9 +438,9 @@ DoFormat:
; It is a character ; It is a character
jsr GetIntArg ; Get the argument (promoted to int) jsr GetIntArg ; Get the argument (promoted to int)
jsr PutBuf sta Buf ; Place it as zero terminated string...
lda #0 ; Place it as zero terminated string... lda #0
jsr PutBuf ; ...into the buffer sta Buf+1 ; ...into the buffer
jmp HaveArg ; Done jmp HaveArg ; Done
; Is it an integer? ; Is it an integer?
@@ -448,11 +472,8 @@ CheckInt:
sty Buf sty Buf
inc BufIdx inc BufIdx
@Int1: jsr pusheax @Int1: ldy #10 ; Base
jsr GetBufPtr jsr ltoa ; Push arguments, call _ltoa
jsr pushax
lda #10
jsr _ltoa ; ltoa (va_arg (ap, long), s, 10);
jmp HaveArg jmp HaveArg
; Is it a count pseudo format? ; Is it a count pseudo format?
@@ -485,7 +506,7 @@ CheckOctal:
jsr GetSignedArg ; Get argument as a long jsr GetSignedArg ; Get argument as a long
ldy AltForm ; Alternative form? ldy AltForm ; Alternative form?
beq @Oct1 ; Jump if no beq @Oct1 ; Jump if no
tay ; Save low byte of value pha ; Save low byte of value
stx tmp1 stx tmp1
ora tmp1 ora tmp1
ora sreg ora sreg
@@ -494,15 +515,11 @@ CheckOctal:
ora Prec+1 ; Check if value or Prec != 0 ora Prec+1 ; Check if value or Prec != 0
beq @Oct1 beq @Oct1
lda #'0' lda #'0'
sta Buf jsr PutBuf
inc BufIdx pla ; Restore low byte
tya ; Restore low byte
@Oct1: jsr pusheax ; Push value @Oct1: ldy #8 ; Load base
jsr GetBufPtr ; Get buffer pointer... jsr ltoa ; Push arguments, call _ltoa
jsr pushax ; ...and push it
lda #8 ; Load base
jsr _ltoa ; ltoa (l, s, 8);
jmp HaveArg jmp HaveArg
; Check for a string specifier (%s) ; Check for a string specifier (%s)
@@ -527,11 +544,8 @@ CheckUnsigned:
; It's an unsigned integer ; It's an unsigned integer
jsr GetUnsignedArg ; Get argument as unsigned long jsr GetUnsignedArg ; Get argument as unsigned long
jsr pusheax ldy #10 ; Load base
jsr GetBufPtr ; Get buffer pointer... jsr ultoa ; Push arguments, call _ultoa
jsr pushax ; ...and push it
lda #10 ; Load base
jsr _ultoa ; ultoa (l, s, 10);
jmp HaveArg jmp HaveArg
; Check for a hexadecimal integer (%x) ; Check for a hexadecimal integer (%x)
@@ -552,12 +566,9 @@ CheckHex:
lda #'X' lda #'X'
jsr PutBuf jsr PutBuf
@L1: jsr GetUnsignedArg ; Get argument as an unsigned long @L1: jsr GetUnsignedArg ; Get argument as an unsigned long
jsr pusheax ldy #16 ; Load base
jsr GetBufPtr ; Get buffer pointer... jsr ultoa ; Push arguments, call _ultoa
jsr pushax ; ...and push it
lda #16 ; Load base
jsr _ultoa ; ultoa (l, s, 16);
pla ; Get the format spec pla ; Get the format spec
cmp #'x' ; Lower case? cmp #'x' ; Lower case?
@@ -664,7 +675,6 @@ HaveArg:
RegSave: .res 6 RegSave: .res 6
; Stuff from OutData. Is used as a vector and must be aligned ; Stuff from OutData. Is used as a vector and must be aligned
.align 2
OutFunc: .word 0 OutFunc: .word 0
; One character argument for OutFunc ; One character argument for OutFunc