1
0
mirror of https://github.com/cc65/cc65.git synced 2024-11-04 17:04:58 +00:00

Merge pull request #2174 from colinleroy/conio-65c02-optimisations

Conio: 65c02 optimisations
This commit is contained in:
Bob Andrews 2023-09-04 18:00:23 +02:00 committed by GitHub
commit 870581a4d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 69 additions and 24 deletions

View File

@ -14,6 +14,8 @@
.include "apple2.inc"
.macpack cpu
.segment "ONCE"
.ifdef __APPLE2ENH__
@ -51,8 +53,13 @@ cputdirect:
cmp WNDWDTH
bcc :+
jsr newline
left: lda #$00 ; Goto left edge of screen
left:
.if (.cpu .bitand CPU_ISET_65SC02)
stz CH ; Goto left edge of screen
.else
lda #$00 ; Goto left edge of screen
sta CH
.endif
: rts
newline:
@ -78,17 +85,18 @@ mask: and INVFLG ; Apply normal, inverse, flash
putchardirect:
pha
ldy CH
.ifdef __APPLE2ENH__
lda CH
bit RD80VID ; In 80 column mode?
bpl put ; No, just go ahead
tya
lsr ; Div by 2
tay
bcs put ; Odd cols go in main memory
bit HISCR ; Assume SET80COL
put: tay
.else
ldy CH
.endif
put: lda (BASL),Y ; Get current character
lda (BASL),Y ; Get current character
tax ; Return old character for _cgetc
pla
sta (BASL),Y

View File

@ -8,28 +8,46 @@
.export _cputsxy, _cputs
.import gotoxy, _cputc
.importzp ptr1, tmp1
.macpack cpu
_cputsxy:
sta ptr1 ; Save s for later
stx ptr1+1
jsr gotoxy ; Set cursor, pop x and y
.if (.cpu .bitand CPU_ISET_65SC02)
bra L0 ; Same as cputs...
.else
jmp L0 ; Same as cputs...
.endif
_cputs: sta ptr1 ; Save s
stx ptr1+1
L0: ldy #0
L1: lda (ptr1),y
beq L9 ; Jump if done
.if (.cpu .bitand CPU_ISET_65SC02)
L0: lda (ptr1) ; (5)
beq L9 ; (7) Jump if done
jsr _cputc ; (13) Output char, advance cursor
inc ptr1 ; (18) Bump low byte
bne L0 ; (20) Next char
inc ptr1+1 ; (25) Bump high byte
bne L0
.else
L0: ldy #0 ; (2)
L1: lda (ptr1),y ; (7)
beq L9 ; (9) Jump if done
iny
sty tmp1 ; Save offset
jsr _cputc ; Output char, advance cursor
ldy tmp1 ; Get offset
bne L1 ; Next char
inc ptr1+1 ; Bump high byte
sty tmp1 ; (14) Save offset
jsr _cputc ; (20) Output char, advance cursor
ldy tmp1 ; (23) Get offset
bne L1 ; (25) Next char
inc ptr1+1 ; (30) Bump high byte
bne L1
.endif
; Done
L9: rts

View File

@ -10,7 +10,7 @@
.importzp sp, ptr1, ptr2, ptr3, tmp1
.macpack generic
.macpack cpu
.data
@ -74,21 +74,40 @@ out: jsr popax ; count
; Loop outputting characters
.if (.cpu .bitand CPU_ISET_65SC02)
@L1: dec outdesc+6
beq @L4
@L2: ldy tmp1
lda (ptr1),y
iny
bne @L3
inc ptr1+1
@L3: sty tmp1
jsr _cputc
jmp @L1
@L2: lda (ptr1) ; (5)
inc ptr1 ; (10)
bne @L3 ; (12)
inc ptr1+1 ; (17)
@L3: jsr _cputc ; (23)
bra @L1 ; (26)
@L4: dec outdesc+7
bne @L2
rts
.else
@L1: dec outdesc+6
beq @L4
@L2: ldy tmp1 ; (3)
lda (ptr1),y ; (8)
iny ; (10)
bne @L3 ; (12)
inc ptr1+1 ; (17)
@L3: sty tmp1 ; (20)
jsr _cputc ; (26)
jmp @L1 ; (32)
@L4: dec outdesc+7
bne @L2
rts
.endif
; ----------------------------------------------------------------------------
; vcprintf - formatted console i/o
;