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

Added a special version of a function which uses an absolute addressing mode to access the zero page.

Browse Source 
The PCEngine needs such operands to be redirected to RAM page $20 explicitly.  Fixes #1482; fixes #1483.
This commit is contained in:
Greg King
2021-05-04 11:54:06 -04:00
parent 04cd884f8f
commit 216bb22b20
2 changed files with 814 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
libsrc/common/_printf.s
View File

@@ -3,7 +3,7 @@
;
; Ullrich von Bassewitz, 2000-10-21
;
.include "zeropage.inc"
.export __printf
@@ -32,8 +32,8 @@ FCount = ptr2
.code
; ----------------------------------------------------------------------------
; Get one character from the format string and increment the pointer. Will
; return zero in Y.
; Get one character from the format string, and increment the pointer. Will
; return zero in .Y.
GetFormatChar:
ldy #0
@@ -51,7 +51,7 @@ OutputPadChar:
lda PadChar
; ----------------------------------------------------------------------------
; Call the output function with one character in A
; Call the output function with one character in .A
Output1:
sta CharArg
@@ -92,7 +92,7 @@ GetSignedArg:
jmp axlong ; Convert to long
; ----------------------------------------------------------------------------
; Get a long argument from the argument list. Returns 0 in Y.
; Get a long argument from the argument list. Returns 0 in .Y.
GetLongArg:
jsr GetIntArg ; Get high word
@@ -102,7 +102,7 @@ GetLongArg:
; Run into GetIntArg fetching the low word
; ----------------------------------------------------------------------------
; Get an integer argument from the argument list. Returns 0 in Y.
; Get an integer argument from the argument list. Returns 0 in .Y.
GetIntArg:
jsr DecArgList2
@@ -114,7 +114,7 @@ GetIntArg:
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:
ldy #0
@@ -247,10 +247,10 @@ Save: lda regbank,y
sta RegSave,y
dey
bpl Save
pla ; Restore low byte of ap
; Get the parameters from the stack
pla ; Restore low byte of ap
sta ArgList ; Argument list pointer
stx ArgList+1
@@ -307,7 +307,7 @@ MainLoop:
inc Format+1
; Calculate, how many characters must be output. Beware: This number may
; be zero. A still contains the low byte of the pointer.
; be zero. .A still contains the low byte of the pointer.
@L3: sub FSave
sta FCount
@@ -343,7 +343,7 @@ MainLoop:
; We're back from out(), or we didn't call it. Check for end of string.
@L4: jsr GetFormatChar ; Get one char, zero in Y
@L4: jsr GetFormatChar ; Get one char, zero in .Y
tax ; End of format string reached?
bne NotDone ; End not reached
@@ -357,7 +357,7 @@ Rest: lda RegSave,x
rts
; Still a valid format character. Check for '%' and a '%%' sequence. Output
; anything that is not a format specifier. On intro, Y is zero.
; anything that is not a format specifier. On intro, .Y is zero.
NotDone:
cmp #'%'
@@ -371,7 +371,7 @@ NotDone:
; We have a real format specifier
; Format is: %[flags][width][.precision][mod]type
; Y is zero on entry.
; .Y is zero on entry.
FormatSpec:
@@ -383,7 +383,7 @@ FormatSpec:
dex
bpl @L1
; Start with reading the flags if there are any. X is $FF which is used
; Start with reading the flags if there are any. .X is $FF which is used
; for "true"
ReadFlags:
@@ -410,7 +410,7 @@ ReadFlags:
@L4: jsr IncFormatPtr
jmp ReadFlags ; ...and start over
; Done with flags, read the pad char. Y is still zero if we come here.
; Done with flags, read the pad char. .Y is still zero if we come here.
ReadPadding:
ldx #' ' ; PadChar
@@ -421,8 +421,8 @@ ReadPadding:
lda (Format),y ; Read current for later
@L1: stx PadChar
; Read the width. Even here, Y is still zero. A contains the current character
; from the format string
; Read the width. Even here, .Y is still zero. .A contains the current character
; from the format string.
ReadWidth:
cmp #'*'
@@ -435,7 +435,7 @@ ReadWidth:
@L2: sta Width
stx Width+1 ; ...and remember in Width
; Read the precision. Even here, Y is still zero.
; Read the precision. Even here, .Y is still zero.
sty Prec ; Assume Precision is zero
sty Prec+1
@@ -456,7 +456,7 @@ ReadPrec:
@L2: sta Prec
stx Prec+1
; Read the modifiers. Y is still zero.
; Read the modifiers. .Y is still zero.
ReadMod:
lda (Format),y
@@ -479,9 +479,9 @@ ReadMod:
; Initialize the argument buffer pointers. We use a static buffer (ArgBuf) to
; assemble strings. A zero page index (BufIdx) is used to keep the current
; write position. A pointer to the buffer (Str) is used to point to the the
; argument in case we will not use the buffer but a user supplied string.
; Y is zero when we come here.
; write position. A pointer to the buffer (Str) is used to point to the
; argument in case we will not use the buffer but a user-supplied string.
; .Y is zero when we come here.
DoFormat:
sty BufIdx ; Clear BufIdx
@@ -490,7 +490,7 @@ DoFormat:
ldx #>Buf
stx Str+1
; Skip the current format character, then check it (current char in A)
; Skip the current format character, then check it (current char in .A)
jsr IncFormatPtr
@@ -777,8 +777,5 @@ ArgLen: .res 2
.data
; Stuff from OutData. Is used as a vector and must be aligned
; Stuff from OutData. Is used as a vector
CallOutFunc: jmp $0000