Apple-2-SW/Applecorn
1
0
Fork 0
mirror of https://github.com/bobbimanners/Applecorn.git synced 2024-06-23 11:29:30 +00:00
Code Issues Projects Releases Wiki Activity

JGH VDU driver fixes. Fixes ticket #38.

Browse Source
This commit is contained in:
Bobbi Webber-Manners 2021-08-21 17:53:18 -04:00
parent 04cf21037b
commit 69790423f2
3 changed files with 181 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
applecorn.po
View File

Binary file not shown.

206
auxmem.chario.s
View File

@ -1,8 +1,10 @@
* AUXMEM.CHARIO.S
* (c) Bobbi 2021 GPLv3
*
* Applecorn kernel / Character I/O
* AppleMOS Character I/O
* KERNEL/CHARIO.S
*****************
* Character read and write
*
* 14-Aug-2021 Flashing cursor and INKEY sync'd to frame rate
@ -12,14 +14,19 @@
* 16-Aug-2021 Copy cursor and Edit cursor visible.
* 17-Aug-2021 OSBYTE 4 for cursors, OSBYTE 221-228 for topbit
* keys.
* *BUGS* INKEY doesn't restore cursor on timeout.
* KBDREAD has several paths that don't test ESCCHAR.
* If screen scrolls, copy cursor on wrong line
* 21-Aug-2021 FIXED: If screen scrolls, copy cursor ends on
* wrong line.
* FIXED: KBDREAD has several paths that don't
* test ESCHAR.
* FIXED: INKEY doesn't restore cursor on timeout.
* The three separate cursors can be set seperately.
* TEMP:
* TEMP, move to VDU.S
FLASHER EQU $290
CURSOR EQU $291
CURSORED EQU $292
CURSORCP EQU $293
OLDCHAR EQU $294
COPYCHAR EQU $295
@ -28,25 +35,12 @@ FXESCCHAR EQU BYTEVARBASE+220
FXKEYBASE EQU BYTEVARBASE+221
FXESCON EQU BYTEVARBASE+229
FXESCEFFECT EQU BYTEVARBASE+230
FX200VAR EQU BYTEVARBASE+200
FX254VAR EQU BYTEVARBASE+254
FX2VAR EQU BYTEVARBASE+$B1
FX3VAR EQU BYTEVARBASE+$EC
FX4VAR EQU BYTEVARBASE+$ED
* TEMP as no *KEY
* Default keyboard OSBYTE variables
DEFBYTELOW EQU 219 ; First default OSBYTE value
DEFBYTE DB $09,$1B ; Default key codes
DB $C0,$D0,$E0,$F0 ; Default key expansion
DB $80,$90,$A0,$B0 ; Default key expansion
DEFBYTEEND
KBDINIT LDX #DEFBYTEEND-DEFBYTE-1
:INITPG3 LDA DEFBYTE,X ; Initialize OSBYTE vars
STA BYTEVARBASE+DEFBYTELOW,X
DEX
BPL :INITPG3
RTS
* OSWRCH handler
****************
@ -65,6 +59,33 @@ WRCHHND PHA
PLA
RTS
* Character Input
*****************
* Default keyboard OSBYTE variables
*DEFBYTELOW EQU 219 ; First default OSBYTE value
*DEFBYTE DB $09,$1B ; Default key codes
* DB $01,$D0,$E0,$F0 ; Default key expansion
* DB $01,$80,$90,$00 ; Default key expansion
*DEFBYTEEND
* TEMP as no *KEY
* Default keyboard OSBYTE variables
DEFBYTELOW EQU 219 ; First default OSBYTE value
DEFBYTE DB $09,$1B ; Default key codes
DB $C0,$D0,$E0,$F0 ; Default key expansion
DB $80,$90,$A0,$B0 ; Default key expansion
DEFBYTEEND
KBDINIT LDX #DEFBYTEEND-DEFBYTE-1
:KBDINITLP LDA DEFBYTE,X ; Initialise KBD OSBYTE variables
STA BYTEVARBASE+DEFBYTELOW,X
DEX
BPL :KBDINITLP
LDA #$C0
STA FX254VAR ; Also returns default MODE=0
RTS
* OSRDCH/INKEY handler
**********************
* Read a character from current input
@ -74,17 +95,6 @@ WRCHHND PHA
RDCHHND LDA #$80 ; flag=wait forever
PHY
TAY
* TEST
LDA FXESCCHAR
BNE INKEYGO
* LDA #'_'
* STA CURSOR
* LDA #$A0
* STA CURSORED
* ^ moved to VDU.S
LDA #$1B
STA FXESCCHAR
* TEST
BRA INKEYGO ; Wait forever for input
; XY<$8000 - wait for a keypress
@ -92,7 +102,7 @@ INKEY PHY ; Dummy PHY to balance RDCH
INKEYGO PHX ; Save registers
PHY
;
BIT VDUSTATUS
BIT VDUSTATUS ; Enable editing cursor
BVC INKEYGO2 ; No editing cursor
JSR GETCHRC ; Get character under cursor
STA COPYCHAR ; Save char under edit cursor
@ -102,20 +112,6 @@ INKEYGO PHX ; Save registers
INKEYGO2 JSR GETCHRC ; Get character under cursor
STA OLDCHAR
;
;* This can be optimised
; JSR GETCHRC ; Get character under cursor
; STA OLDCHAR
; BIT VDUSTATUS
; BVC INKEYGO2 ; No editing cursor
; STA COPYCHAR ; Save char under edit cursor
; LDA CURSORED
; JSR PUTCHRC ; Display edit cursor
; JSR COPYSWAP1 ; Swap to copy cursor
; JSR GETCHRC ; Get character under copy cursor
; STA OLDCHAR
;*
;INKEYGO2
CLI
BRA INKEY1 ; Turn cursor on
;
@ -134,6 +130,9 @@ INKEY0 ADC FLASHER
BIT FLASHER
BMI INKEY2 ; Remove cursor
INKEY1 LDA CURSOR ; Add cursor
BIT VDUSTATUS
BVC INKEY2
LDA CURSORCP
INKEY2 JSR PUTCHRC ; Toggle cursor
INKEY3 LDA ESCFLAG
BMI INKEYOK ; Escape pending, return it
@ -159,36 +158,31 @@ INKEYDEC DEX
BNE INKEYLP1 ; Not 0, loop back
TYA
BNE INKEYLP1 ; Not 0, loop back
;
PHY
JSR INKEYOFF ; Restore cursors
PLY
;
DEY ; Y=$FF
TYA ; A=$FF
PLX ; Drop dummy PHY
RTS ; CS from above
SEC
RTS
; Timeout: CS, AY=$FFFF, becomes XY=$FFFF
INKEYOK PHA
;
LDA OLDCHAR
JSR PUTCHRC ; Remove cursor
BIT VDUSTATUS
BVC INKEYOK2 ; No editing cursor
JSR COPYSWAP1 ; Swap cursor back
LDA COPYCHAR
JSR PUTCHRC ; Remove edit cursor
INKEYOK2
JSR INKEYOFF ; Restore cursors
;
;* This can be optimised
; BIT VDUSTATUS
; BVC INKEYOK2 ; No editing cursor
; LDA OLDCHAR
; JSR PUTCHRC ; Remove copy cursor
; JSR COPYSWAP1 ; Swap cursor back
; LDA COPYCHAR
; BRA INKEYOK3 ; Restore char under edit cursor
;*
;INKEYOK2 LDA OLDCHAR ; and swap cursor back
;INKEYOK3 JSR PUTCHRC ; Remove edit cursor
* LDA OLDCHAR ; Remove editing cursor
* JSR PUTCHRC ; Remove cursor
* BIT VDUSTATUS
* BVC INKEYOK2 ; No editing cursor
* JSR COPYSWAP1 ; Swap cursor back
* LDA COPYCHAR
* JSR PUTCHRC ; Remove edit cursor
;
PLA
INKEYOK2 PLA
PLY ; <$80=INKEY or $80=RDCH
PLX ; Restore X
PLY ; <$80=INKEY or restore=RDCH
@ -197,9 +191,16 @@ INKEYOK2
ASL A ; Cy=Escape flag
PLA ; Get char back
RTS
; Character read: CC, A=char, X=???, Y<$80
; Escape: CS, A=?? , X=???, Y<$80
* Character read: CC, A=char, X=???, Y<$80
* Escape: CS, A=?? , X=???, Y<$80
INKEYOFF LDA OLDCHAR ; Remove editing cursor
BIT VDUSTATUS
BVC INKEYOFF2 ; No editing cursor
JSR PUTCHRC ; Remove cursor
JSR COPYSWAP1 ; Swap cursor back
LDA COPYCHAR ; Remove edit cursor
INKEYOFF2 JMP PUTCHRC
BYTE81 TYA
BMI NEGINKEY ; XY<0, scan for keypress
@ -218,9 +219,12 @@ BYTE81DONE RTS
* Y=$1B, X=???, CS - escape
* Y=$00, X=char, CC - keypress
NEGINKEY LDX #$00 ; Unimplemented
NEGINKEY CPX #$01
LDX #$00 ; Unimplemented
LDY #$00
CLC
BCS NEGINKEY0
LDX #$20 ; INKEY-256
NEGINKEY0 CLC
RTS
@ -228,7 +232,7 @@ NEGINKEY LDX #$00 ; Unimplemented
*******************
* KEYREAD
*************************
************************
* Test for and read from input,
* expanding keyboard special keys
*
@ -308,8 +312,6 @@ KEYSOFT TYA
* Process cursor keys
KEYCURSOR CMP #$C9
BEQ KEYCOPY
; CMP #$CC
; BCC KEYREADOK ; Not cursor key
PHA
LDA OLDCHAR
JSR PUTCHRC ; Remove cursor
@ -335,7 +337,7 @@ KEYCOPY LDA FXTABCHAR ; Prepare TAB if no copy cursor
* KBDREAD
*************************
************************
* Test for and fetch key from keyboard
*
* On exit, CS=no keypress
@ -358,46 +360,50 @@ KBDTEST LDA $C000 ; VS here to test for keypress
BIT $C062
BMI KBDRALT ; Right Apple pressed
CMP #$09
BEQ KBDTAB ;
BEQ KBDTAB ; TAB is dual action TAB/COPY
CMP #$08
BCC KBDESC ; <$08 not cursor key
BCC KBDCHKESC ; <$08 not cursor key
CMP #$0C
BCC KBDCURSR
BCC KBDCURSR ; $08-$0B are cursor keys
CMP #$15
BEQ KBDCUR15
* Test for Escape key
KBDESC CMP FXESCCHAR ; Current ESCAPE char?
* CMP #27 ; TEMP
BNE KBDNOESC ; No
LDX FXESCON ; Is ESCAPE enabled?
BNE KBDNOESC ; No
ROR ESCFLAG ; Set Escape flag
KBDNOESC CLC ; CLC=Ok
KBDDONE RTS
BNE KBDCHKESC ; $15 is cursor key
;
KBDCUR15 LDA #$0D ; Convert RGT to $09
KBDTAB SBC #$04 ; Convert TAB to &C9
KBDCURSR CLC
ADC #$C4 ; Cursor keys $C0+x
BRA KBDCHKESC
KBDRALT ; Right Apple key pressed
KBDLALT CMP #$40 ; Left Apple key pressed
BCS KBDCTRL
CMP #$30
BCC KBDFUNOK ; <'0'
BCC KBDCHKESC ; <'0'
CMP #$3A
BCS KBDOK ; >'9'
BCS KBDCHKESC ; >'9'
KBDFUNC AND #$0F ; Convert Apple-Num to function key
ORA #$80
BIT $C062
BPL KBDFUNOK ; Left+Digit -> $8x
BPL KBDCHKESC ; Left+Digit -> $8x
ORA #$90 ; Right+Digit -> $9x
BIT $C061
BPL KBDFUNOK
BPL KBDCHKESC
EOR #$30 ; Left+Right+Digit -> $Ax
KBDFUNOK RTS
BRA KBDCHKESC
KBDCTRL AND #$1F ; Apple-Letter -> Ctrl-Letter
KBDOK CLC
RTS
KBDTAB LDA #$11 ; Convert TAB to $C9, expanded later
KBDCUR15 SBC #$0C ; Convert RGT to $09
KBDCURSR CLC
ADC #$C4 ; Cursor keys $CC-$CF
RTS ; CLC=Ok set earlier
;
* Test for Escape key
KBDCHKESC TAX ; X=keycode
EOR FXESCCHAR ; Current ESCAPE char?
ORA FXESCON ; Is ESCAPE an ASCII char?
BNE KBDNOESC ; Not ESCAPE or ESCAPE=ASCII
LDA FX200VAR ; Is ESCAPE ignored?
LSR A ; Check bit 0
BCS KBDDONE ; ESCAPE completely ignored
SEC
ROR ESCFLAG ; Set Escape flag
KBDNOESC TXA ; A=keycode
CLC ; CLC=Ok
KBDDONE RTS

119
auxmem.vdu.s
View File

@ -1,12 +1,15 @@
* VDU.S
****************************************************
* (c) Bobbi 2021 GPLv3
*
* Apple //e VDU Driver for 40/80 column mode (PAGE2)
****************************************************
*
* 15-Aug-2021 Optimised address calculations and PRCHRC.
* Entry point to move copy cursor.
* Start to consolidate VDU workspace.
* 16-Aug-2021 Added COPY cursor handling.
* 21-Aug-2021 CHR$(&80+n) is inverse of CHR$(&00+n)
* 21-Aug-2021 If screen scrolls, copy cursor adjusted.
**********************************
@ -18,25 +21,25 @@ VDUSTATUS EQU $D0 ; $D0 VDU status
VDUZP1 EQU VDUSTATUS+1 ; $D1
* VDUTEXTX EQU VDUSTATUS+2 ; $D2 text column
* VDUTEXTY EQU VDUSTATUS+3 ; $D3 text row
VDUADDR EQU VDUSTATUS+4 ; $D4 address of current char cell
VDUADDR EQU VDUSTATUS+4 ; $D4 addr of current char cell
FXVDUQLEN EQU $D1 ; TEMP HACK
VDUCHAR EQU $D6 ; TEMP HACK
VDUQ EQU $D7 ; TEMP HACK
* VDUVARS
* VDUTEXTX EQU $250+0 ; text X coord
* VDUTEXTY EQU $250+1 ; text Y coord
* VDUTEXTX EQU $2A0+0 ; text X coord
* VDUTEXTY EQU $2A0+1 ; text Y coord
VDUTEXTX EQU COL
VDUTEXTY EQU ROW
VDUCOPYX EQU $250+2 ; copy cursor X coord
VDUCOPYY EQU $250+3 ; copy cursor Y coord
* VDUCOPYCHR EQU $260+0 ; char underneath cursor when copying
VDUCOPYX EQU $2A0+2 ; copy cursor X coord
VDUCOPYY EQU $2A0+3 ; copy cursor Y coord
* VDUCOPYCHR EQU $2A0+0 ; char underneath cursor when copying
* VDUCURSOR EQU $250+4 ; cursor character
* VDUMODE EQU $250+5 ; current MODE
* VDUCHAR EQU $250+6 ; VDU command, 1 byte
* VDUQ EQU $250+7 ; VDU sequence, 9 bytes
* VDUCURSOR EQU $2A0+4 ; cursor character
VDUMODE EQU $2A0+5 ; current MODE
* VDUCHAR EQU $2A0+6 ; VDU command, 1 byte
* VDUQ EQU $2A0+7 ; VDU sequence, 9 bytes
* KBD or VDU?
* FLASHER ; flash counter for cursor
@ -65,19 +68,19 @@ COPYMOVE2 PLA
ORA #8
COPYMOVE3 JMP OUTCHARGO ; Move edit cursor
;* Turn editing cursor on/off
;COPYCURSOR BIT VDUSTATUS
; BVC COPYSWAP4 ; Copy cursor not active
; PHP ; Save CS=Turn On, CC=Turn Off
; JSR COPYSWAP1 ; Swap to edit cursor
; LDA COPYCHAR ; Prepare to turn edit cursor off
; PLP
; BCC COPYCURS2 ; Restore character
;COPYCURS1 JSR GETCHRC ; Get character under edit cursor
; STA COPYCHAR
; LDA #$A0 ; Output edit cursor
;COPYCURS2 JSR PUTCHRC
;* ; Drop through to swap back
* Turn editing cursor on/off
*COPYCURSOR BIT VDUSTATUS
* BVC COPYSWAP4 ; Copy cursor not active
* PHP ; Save CS=Turn On, CC=Turn Off
* JSR COPYSWAP1 ; Swap to edit cursor
* LDA COPYCHAR ; Prepare to turn edit cursor off
* PLP
* BCC COPYCURS2 ; Restore character
*COPYCURS1 JSR GETCHRC ; Get character under edit cursor
* STA COPYCHAR
* LDA #$A0 ; Output edit cursor
*COPYCURS2 JSR PUTCHRC
* ; Drop through to swap back
* Swap between edit and copy cursors
;COPYSWAP BIT VDUSTATUS
@ -126,9 +129,10 @@ CLREOL LDA ROW
* Clear the screen
VDUINIT STA $C00F
LDA #'_'
STA CURSOR
STA CURSOR ; Normal cursor
STA CURSORCP ; Copy cursor when editing
LDA #$A0
STA CURSORED
STA CURSORED ; Edit cursor when editing
CLEAR STZ ROW
STZ COL
:L1 JSR CLREOL
@ -166,7 +170,7 @@ PRCHRC PHA ; Save character
LDA $C000
BPL :RESUME ; No key pressed
EOR #$80
:PAUSE1 JSR KBDESC ; Ask KBD to test if Escape
:PAUSE1 JSR KBDCHKESC ; Ask KBD to test if Escape
BIT ESCFLAG
BMI :RESUMEACK ; Escape, skip pausing
CMP #$13
@ -177,35 +181,41 @@ PRCHRC PHA ; Save character
EOR #$80
CMP #$11 ; Ctrl-Q
BEQ :RESUMEACK ; Stop pausing
JSR KBDESC ; Ask KBD to test if Escape
JSR KBDCHKESC ; Ask KBD to test if Escape
BIT ESCFLAG
BPL :PAUSE2 ; No Escape, keep pausing
:RESUMEACK STA $C010 ; Ack. keypress
:RESUME PLA
* Put character to screen
PUTCHRC PHA
PRCHR5 JSR CHARADDR ; Find character address
PUTCHRC EOR #$80 ; Convert character
TAY
AND #$A0
BNE PRCHR4
TYA
EOR #$40
TAY
PRCHR4 PHY
JSR CHARADDR ; Find character address
PLA ; Get character back
PHP ; Disable IRQs while
SEI ; toggling memory
BCC PRCHR6 ; Aux memory
STA $C004 ; Switch to main memory
PRCHR6 EOR #$80 ; Convert character
STA (VDUADDR),Y ; Store it
PRCHR6 STA (VDUADDR),Y ; Store it
STA $C005 ; Back to aux memory
PLP ; Restore IRQs
RTS
* PHA
* LDA $C000 ; Kbd data/strobe
* LDA $C000 ; Kbd data/strobe
* BMI :KEYHIT
* :RESUME LDA ROW
* ASL
* TAX
* LDA SCNTAB,X ; LSB of row address
* LDA SCNTAB,X ; LSB of row address
* STA ZP1
* LDA SCNTAB+1,X ; MSB of row address
* LDA SCNTAB+1,X ; MSB of row address
* STA ZP1+1
* LDA COL
* BIT $C01F
@ -248,7 +258,14 @@ GETCHRC JSR CHARADDR ; Find character address
GETCHR6 LDA (VDUADDR),Y ; Get character
STA $C003 ; Back to aux memory
PLP ; Restore IRQs
EOR #$80 ; Convert character
TAY ; Convert character
AND #$A0
BNE GETCHR7
TYA
EOR #$40
TAY
GETCHR7 TYA
EOR #$80
TAX ; X=char for OSBYTE
LDY #$00
BIT $C01F
@ -268,11 +285,11 @@ GETCHROK RTS
* BPL :S1A ; 40-col
* LSR
* BCC :S1
*:S1A STA $C002 ; Read main memory
*:S1A STA $C002 ; Read main memory
*:S1 TAY
* LDA (ZP1),Y
* EOR #$80
* STA $C003 ; Read aux mem again
* STA $C003 ; Read aux mem again
* TAX
* LDY #$00
* BIT $C01F
@ -375,7 +392,6 @@ OUTCHARGO CMP #$00 ; NULL
BNE :T5
LDA ROW
CMP #23
* BEQ SCROLL ; BOBBI
BEQ :TOSCROLL ; JGH
INC ROW
:IDONE RTS
@ -401,18 +417,19 @@ OUTCHARGO CMP #$00 ; NULL
CMP #$16 ; MODE
BNE :T8
LDA VDUQ+8
STA VDUMODE
EOR #$07
AND #$01
TAX
STA $C00C,X
:T7A JSR CLEAR
; BRA :IDONE
* BRA :IDONE
RTS
:T8 CMP #$1E ; Home
BNE :T9
STZ ROW
STZ COL
; BRA :IDONE
* BRA :IDONE
RTS
:T9
CMP #$1F ; TAB
@ -437,7 +454,15 @@ OUTCHARGO CMP #$00 ; NULL
RTS
:T10 CMP #$20
BCC :IDONE
JSR PRCHRC ; Store char, checking keypress
CMP #$80
BCC :T10A
CMP #$A0
BCS :T10A
LDX VDUMODE
CPX #$07
BNE :T10A
LDA #$20
:T10A JSR PRCHRC ; Store char, checking keypress
* Perform cursor right operation
VDU09 LDA COL
@ -470,7 +495,13 @@ SCROLLER LDA #$00
INC
CMP #23
BNE :L1
RTS
BIT VDUSTATUS
BVC :L2 ; Copy cursor not active
JSR COPYSWAP1
LDA #11
JSR OUTCHARGO
JSR COPYSWAP1
:L2 RTS
* Copy line A+1 to line A
SCR1LINE ASL ; Dest addr->ZP1