diff --git a/applecorn.po b/applecorn.po index f2ef00a..9d6863f 100644 Binary files a/applecorn.po and b/applecorn.po differ diff --git a/applecorn.s b/applecorn.s index c6d9f82..65290e5 100644 --- a/applecorn.s +++ b/applecorn.s @@ -6,8 +6,10 @@ * * 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 ; 65816 ORG $4000 ; Load addr of loader in main memory ; Clear of first HGR frame buffer @@ -88,10 +90,10 @@ XF2AUX MAC * Called by code running in aux mem to invoke a * routine in main memory XF2MAIN MAC - LDX STRTL - STX STRTBCKL - LDX STRTH - STX STRTBCKH +* LDX STRTL ; No longer needed +* STX STRTBCKL ; $03E0-$03FF reserved for memory +* LDX STRTH ; switching +* STX STRTBCKH LDX #<]1 STX STRTL LDX #>]1 @@ -111,10 +113,10 @@ ENTAUX MAC LDX $0101 ; Recover alt SP TXS CLI ; Re-enable IRQ after XFER - LDX STRTBCKL - STX STRTL - LDX STRTBCKH - STX STRTH +* LDX STRTBCKL ; No longer needed +* STX STRTL ; $03e0-$03FF reserved for memory +* LDX STRTBCKH ; switching +* STX STRTH EOM * Macro called on re-entry to main memory @@ -217,14 +219,6 @@ MAINZP MAC - - - - - - - - diff --git a/auxmem.init.s b/auxmem.init.s index 47d76b4..2f09ddd 100644 --- a/auxmem.init.s +++ b/auxmem.init.s @@ -12,10 +12,6 @@ ZP1 EQU $90 ; $90-$9f are spare Econet space ZP2 EQU $92 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 STRTBCKH EQU $9E @@ -172,27 +168,12 @@ PRHELLO LDA #