Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-11-26 11:49:22 +00:00
Code Issues Projects Releases Wiki Activity

reg_x removal: c64textio and c64lib. last one.

Browse Source
This commit is contained in:
Irmen de Jong 2020-09-13 20:52:29 +02:00
parent 1f69deaccd
commit f42746ba06
3 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/res/prog8lib/c64lib.p8
View File

@ -299,8 +299,6 @@ _irq_handler_init
sta IRQ_SCRATCH_ZPB1 sta IRQ_SCRATCH_ZPB1
lda P8ZP_SCRATCH_REG lda P8ZP_SCRATCH_REG
sta IRQ_SCRATCH_ZPREG sta IRQ_SCRATCH_ZPREG
lda P8ZP_SCRATCH_REG_X ; TODO remove REG_X
sta IRQ_SCRATCH_ZPREGX ; TODO remove this storage byte
lda P8ZP_SCRATCH_W1 lda P8ZP_SCRATCH_W1
sta IRQ_SCRATCH_ZPWORD1 sta IRQ_SCRATCH_ZPWORD1
lda P8ZP_SCRATCH_W1+1 lda P8ZP_SCRATCH_W1+1
@ -325,8 +323,6 @@ _irq_handler_end
sta P8ZP_SCRATCH_B1 sta P8ZP_SCRATCH_B1
lda IRQ_SCRATCH_ZPREG lda IRQ_SCRATCH_ZPREG
sta P8ZP_SCRATCH_REG sta P8ZP_SCRATCH_REG
lda IRQ_SCRATCH_ZPREGX ; TODO remove this storage location
sta P8ZP_SCRATCH_REG_X ; TODO remove _REG_X
lda IRQ_SCRATCH_ZPWORD1 lda IRQ_SCRATCH_ZPWORD1
sta P8ZP_SCRATCH_W1 sta P8ZP_SCRATCH_W1
lda IRQ_SCRATCH_ZPWORD1+1 lda IRQ_SCRATCH_ZPWORD1+1
@ -341,7 +337,6 @@ _irq_handler_end
IRQ_X_REG .byte 0 IRQ_X_REG .byte 0
IRQ_SCRATCH_ZPB1 .byte 0 IRQ_SCRATCH_ZPB1 .byte 0
IRQ_SCRATCH_ZPREG .byte 0 IRQ_SCRATCH_ZPREG .byte 0
IRQ_SCRATCH_ZPREGX .byte 0
IRQ_SCRATCH_ZPWORD1 .word 0 IRQ_SCRATCH_ZPWORD1 .word 0
IRQ_SCRATCH_ZPWORD2 .word 0 IRQ_SCRATCH_ZPWORD2 .word 0

50
compiler/res/prog8lib/c64textio.p8
View File

@ -75,7 +75,7 @@ asmsub scroll_left_full (ubyte alsocolors @ Pc) clobbers(A, Y) {
; Carry flag determines if screen color data must be scrolled too ; Carry flag determines if screen color data must be scrolled too
%asm {{ %asm {{
stx P8ZP_SCRATCH_REG_X stx P8ZP_SCRATCH_REG
bcs + bcs +
jmp _scroll_screen jmp _scroll_screen
@ -103,7 +103,7 @@ _scroll_screen ; scroll the screen memory
dey dey
bpl - bpl -
ldx P8ZP_SCRATCH_REG_X ldx P8ZP_SCRATCH_REG
rts rts
}} }}
} }
@ -113,7 +113,7 @@ asmsub scroll_right_full (ubyte alsocolors @ Pc) clobbers(A) {
; contents of the leftmost column are unchanged, you should clear/refill this yourself ; contents of the leftmost column are unchanged, you should clear/refill this yourself
; Carry flag determines if screen color data must be scrolled too ; Carry flag determines if screen color data must be scrolled too
%asm {{ %asm {{
stx P8ZP_SCRATCH_REG_X stx P8ZP_SCRATCH_REG
bcs + bcs +
jmp _scroll_screen jmp _scroll_screen
@ -137,7 +137,7 @@ _scroll_screen ; scroll the screen memory
dex dex
bpl - bpl -
ldx P8ZP_SCRATCH_REG_X ldx P8ZP_SCRATCH_REG
rts rts
}} }}
} }
@ -147,7 +147,7 @@ asmsub scroll_up_full (ubyte alsocolors @ Pc) clobbers(A) {
; contents of the bottom row are unchanged, you should refill/clear this yourself ; contents of the bottom row are unchanged, you should refill/clear this yourself
; Carry flag determines if screen color data must be scrolled too ; Carry flag determines if screen color data must be scrolled too
%asm {{ %asm {{
stx P8ZP_SCRATCH_REG_X stx P8ZP_SCRATCH_REG
bcs + bcs +
jmp _scroll_screen jmp _scroll_screen
@ -171,7 +171,7 @@ _scroll_screen ; scroll the screen memory
dex dex
bpl - bpl -
ldx P8ZP_SCRATCH_REG_X ldx P8ZP_SCRATCH_REG
rts rts
}} }}
} }
@ -181,7 +181,7 @@ asmsub scroll_down_full (ubyte alsocolors @ Pc) clobbers(A) {
; contents of the top row are unchanged, you should refill/clear this yourself ; contents of the top row are unchanged, you should refill/clear this yourself
; Carry flag determines if screen color data must be scrolled too ; Carry flag determines if screen color data must be scrolled too
%asm {{ %asm {{
stx P8ZP_SCRATCH_REG_X stx P8ZP_SCRATCH_REG
bcs + bcs +
jmp _scroll_screen jmp _scroll_screen
@ -205,7 +205,7 @@ _scroll_screen ; scroll the screen memory
dex dex
bpl - bpl -
ldx P8ZP_SCRATCH_REG_X ldx P8ZP_SCRATCH_REG
rts rts
}} }}
} }
@ -231,7 +231,7 @@ asmsub print (str text @ AY) clobbers(A,Y) {
asmsub print_ub0 (ubyte value @ A) clobbers(A,Y) { asmsub print_ub0 (ubyte value @ A) clobbers(A,Y) {
; ---- print the ubyte in A in decimal form, with left padding 0s (3 positions total) ; ---- print the ubyte in A in decimal form, with left padding 0s (3 positions total)
%asm {{ %asm {{
stx P8ZP_SCRATCH_REG_X stx P8ZP_SCRATCH_REG
jsr conv.ubyte2decimal jsr conv.ubyte2decimal
pha pha
tya tya
@ -240,7 +240,7 @@ asmsub print_ub0 (ubyte value @ A) clobbers(A,Y) {
jsr c64.CHROUT jsr c64.CHROUT
txa txa
jsr c64.CHROUT jsr c64.CHROUT
ldx P8ZP_SCRATCH_REG_X ldx P8ZP_SCRATCH_REG
rts rts
}} }}
} }
@ -248,7 +248,7 @@ asmsub print_ub0 (ubyte value @ A) clobbers(A,Y) {
asmsub print_ub (ubyte value @ A) clobbers(A,Y) { asmsub print_ub (ubyte value @ A) clobbers(A,Y) {
; ---- print the ubyte in A in decimal form, without left padding 0s ; ---- print the ubyte in A in decimal form, without left padding 0s
%asm {{ %asm {{
stx P8ZP_SCRATCH_REG_X stx P8ZP_SCRATCH_REG
jsr conv.ubyte2decimal jsr conv.ubyte2decimal
_print_byte_digits _print_byte_digits
pha pha
@ -265,7 +265,7 @@ _print_byte_digits
jsr c64.CHROUT jsr c64.CHROUT
_ones txa _ones txa
jsr c64.CHROUT jsr c64.CHROUT
ldx P8ZP_SCRATCH_REG_X ldx P8ZP_SCRATCH_REG
rts rts
}} }}
} }
@ -273,7 +273,7 @@ _ones txa
asmsub print_b (byte value @ A) clobbers(A,Y) { asmsub print_b (byte value @ A) clobbers(A,Y) {
; ---- print the byte in A in decimal form, without left padding 0s ; ---- print the byte in A in decimal form, without left padding 0s
%asm {{ %asm {{
stx P8ZP_SCRATCH_REG_X stx P8ZP_SCRATCH_REG
pha pha
cmp #0 cmp #0
bpl + bpl +
@ -281,16 +281,14 @@ asmsub print_b (byte value @ A) clobbers(A,Y) {
jsr c64.CHROUT jsr c64.CHROUT
+ pla + pla
jsr conv.byte2decimal jsr conv.byte2decimal
jsr print_ub._print_byte_digits jmp print_ub._print_byte_digits
ldx P8ZP_SCRATCH_REG_X
rts
}} }}
} }
asmsub print_ubhex (ubyte value @ A, ubyte prefix @ Pc) clobbers(A,Y) { asmsub print_ubhex (ubyte value @ A, ubyte prefix @ Pc) clobbers(A,Y) {
; ---- print the ubyte in A in hex form (if Carry is set, a radix prefix '$' is printed as well) ; ---- print the ubyte in A in hex form (if Carry is set, a radix prefix '$' is printed as well)
%asm {{ %asm {{
stx P8ZP_SCRATCH_REG_X stx P8ZP_SCRATCH_REG
bcc + bcc +
pha pha
lda #'$' lda #'$'
@ -300,7 +298,7 @@ asmsub print_ubhex (ubyte value @ A, ubyte prefix @ Pc) clobbers(A,Y) {
jsr c64.CHROUT jsr c64.CHROUT
tya tya
jsr c64.CHROUT jsr c64.CHROUT
ldx P8ZP_SCRATCH_REG_X ldx P8ZP_SCRATCH_REG
rts rts
}} }}
} }
@ -308,7 +306,7 @@ asmsub print_ubhex (ubyte value @ A, ubyte prefix @ Pc) clobbers(A,Y) {
asmsub print_ubbin (ubyte value @ A, ubyte prefix @ Pc) clobbers(A,Y) { asmsub print_ubbin (ubyte value @ A, ubyte prefix @ Pc) clobbers(A,Y) {
; ---- print the ubyte in A in binary form (if Carry is set, a radix prefix '%' is printed as well) ; ---- print the ubyte in A in binary form (if Carry is set, a radix prefix '%' is printed as well)
%asm {{ %asm {{
stx P8ZP_SCRATCH_REG_X stx P8ZP_SCRATCH_REG
sta P8ZP_SCRATCH_B1 sta P8ZP_SCRATCH_B1
bcc + bcc +
lda #'%' lda #'%'
@ -321,7 +319,7 @@ asmsub print_ubbin (ubyte value @ A, ubyte prefix @ Pc) clobbers(A,Y) {
+ jsr c64.CHROUT + jsr c64.CHROUT
dey dey
bne - bne -
ldx P8ZP_SCRATCH_REG_X ldx P8ZP_SCRATCH_REG
rts rts
}} }}
} }
@ -354,7 +352,7 @@ asmsub print_uwhex (uword value @ AY, ubyte prefix @ Pc) clobbers(A,Y) {
asmsub print_uw0 (uword value @ AY) clobbers(A,Y) { asmsub print_uw0 (uword value @ AY) clobbers(A,Y) {
; ---- print the uword in A/Y in decimal form, with left padding 0s (5 positions total) ; ---- print the uword in A/Y in decimal form, with left padding 0s (5 positions total)
%asm {{ %asm {{
stx P8ZP_SCRATCH_REG_X stx P8ZP_SCRATCH_REG
jsr conv.uword2decimal jsr conv.uword2decimal
ldy #0 ldy #0
- lda conv.uword2decimal.decTenThousands,y - lda conv.uword2decimal.decTenThousands,y
@ -362,7 +360,7 @@ asmsub print_uw0 (uword value @ AY) clobbers(A,Y) {
jsr c64.CHROUT jsr c64.CHROUT
iny iny
bne - bne -
+ ldx P8ZP_SCRATCH_REG_X + ldx P8ZP_SCRATCH_REG
rts rts
}} }}
} }
@ -370,9 +368,9 @@ asmsub print_uw0 (uword value @ AY) clobbers(A,Y) {
asmsub print_uw (uword value @ AY) clobbers(A,Y) { asmsub print_uw (uword value @ AY) clobbers(A,Y) {
; ---- print the uword in A/Y in decimal form, without left padding 0s ; ---- print the uword in A/Y in decimal form, without left padding 0s
%asm {{ %asm {{
stx P8ZP_SCRATCH_REG_X stx P8ZP_SCRATCH_REG
jsr conv.uword2decimal jsr conv.uword2decimal
ldx P8ZP_SCRATCH_REG_X ldx P8ZP_SCRATCH_REG
ldy #0 ldy #0
- lda conv.uword2decimal.decTenThousands,y - lda conv.uword2decimal.decTenThousands,y
beq _allzero beq _allzero
@ -546,11 +544,11 @@ _colormod sta $ffff ; modified
asmsub plot (ubyte col @ Y, ubyte row @ A) clobbers(A) { asmsub plot (ubyte col @ Y, ubyte row @ A) clobbers(A) {
; ---- safe wrapper around PLOT kernel routine, to save the X register. ; ---- safe wrapper around PLOT kernel routine, to save the X register.
%asm {{ %asm {{
stx P8ZP_SCRATCH_REG_X stx P8ZP_SCRATCH_REG
tax tax
clc clc
jsr c64.PLOT jsr c64.PLOT
ldx P8ZP_SCRATCH_REG_X ldx P8ZP_SCRATCH_REG
rts rts
}} }}
} }

1
compiler/src/prog8/compiler/target/c64/codegen/AsmGen.kt
View File

@ -105,7 +105,6 @@ internal class AsmGen(private val program: Program,
val zp = CompilationTarget.instance.machine.zeropage val zp = CompilationTarget.instance.machine.zeropage
out("P8ZP_SCRATCH_B1 = ${zp.SCRATCH_B1}") out("P8ZP_SCRATCH_B1 = ${zp.SCRATCH_B1}")
out("P8ZP_SCRATCH_REG = ${zp.SCRATCH_REG}") out("P8ZP_SCRATCH_REG = ${zp.SCRATCH_REG}")
out("P8ZP_SCRATCH_REG_X = ${'$'}9fff") // TODO remove this REG_X altogether!!!
out("P8ZP_SCRATCH_W1 = ${zp.SCRATCH_W1} ; word") out("P8ZP_SCRATCH_W1 = ${zp.SCRATCH_W1} ; word")
out("P8ZP_SCRATCH_W2 = ${zp.SCRATCH_W2} ; word") out("P8ZP_SCRATCH_W2 = ${zp.SCRATCH_W2} ; word")
out("P8ESTACK_LO = ${CompilationTarget.instance.machine.ESTACK_LO.toHex()}") out("P8ESTACK_LO = ${CompilationTarget.instance.machine.ESTACK_LO.toHex()}")