Merge part 1 of PR 121 'XF2MAIN, ENTAUX ...'

This commit is contained in:
Bobbi Webber-Manners 2021-10-14 19:10:11 -04:00
parent a173e8667e
commit 275e22ab99
3 changed files with 14 additions and 39 deletions

Binary file not shown.

View File

@ -6,8 +6,10 @@
* *
* Assembled with the Merlin 8 v2.58 assembler on Apple II. * Assembled with the Merlin 8 v2.58 assembler on Apple II.
* 14-Oct-2021 XF2MAIN, ENTAUX no longer save/restore STRTL/STRTH.
XC ; 65c02 XC ; 65c02
XC ; 65816
ORG $4000 ; Load addr of loader in main memory ORG $4000 ; Load addr of loader in main memory
; Clear of first HGR frame buffer ; Clear of first HGR frame buffer
@ -88,10 +90,10 @@ XF2AUX MAC
* Called by code running in aux mem to invoke a * Called by code running in aux mem to invoke a
* routine in main memory * routine in main memory
XF2MAIN MAC XF2MAIN MAC
LDX STRTL * LDX STRTL ; No longer needed
STX STRTBCKL * STX STRTBCKL ; $03E0-$03FF reserved for memory
LDX STRTH * LDX STRTH ; switching
STX STRTBCKH * STX STRTBCKH
LDX #<]1 LDX #<]1
STX STRTL STX STRTL
LDX #>]1 LDX #>]1
@ -111,10 +113,10 @@ ENTAUX MAC
LDX $0101 ; Recover alt SP LDX $0101 ; Recover alt SP
TXS TXS
CLI ; Re-enable IRQ after XFER CLI ; Re-enable IRQ after XFER
LDX STRTBCKL * LDX STRTBCKL ; No longer needed
STX STRTL * STX STRTL ; $03e0-$03FF reserved for memory
LDX STRTBCKH * LDX STRTBCKH ; switching
STX STRTH * STX STRTH
EOM EOM
* Macro called on re-entry to main memory * Macro called on re-entry to main memory
@ -217,14 +219,6 @@ MAINZP MAC

View File

@ -12,10 +12,6 @@ ZP1 EQU $90 ; $90-$9f are spare Econet space
ZP2 EQU $92 ZP2 EQU $92
ZP3 EQU $94 ZP3 EQU $94
** COL,ROW needs to be in X,Y order
** TO DO: will be moved to VDU space
*COL EQU $96 ; Cursor column
*ROW EQU $97 ; Cursor row
STRTBCKL EQU $9D ; *TO DO* don't need to preserve STRTBCKL EQU $9D ; *TO DO* don't need to preserve
STRTBCKH EQU $9E STRTBCKH EQU $9E
@ -172,27 +168,12 @@ PRHELLO LDA #<HELLO
JSR PRSTR JSR PRSTR
JMP OSNEWL JMP OSNEWL
BYTE00XX BEQ BYTE00A ; OSBYTE 0,0 - generate error BYTE00XX
LDX #$0A ; $00 = identify Host BYTE00 BEQ BYTE00A ; OSBYTE 0,0 - generate error
LDX #$0A ; Identify Host
RTS ; %000x1xxx host type, 'A'pple RTS ; %000x1xxx host type, 'A'pple
BYTE00A BRK BYTE00A BRK
DB $F7 DB $F7
HELLO ASC 'Applecorn MOS 2021-10-13' HELLO ASC 'Applecorn MOS 2021-10-13'
DB $00 ; Unify MOS messages DB $00 ; Unify MOS messages