Merge branch 'master' of https://github.com/a2-4am/4cade

2024-11-26 17:49:43 +00:00 · 2021-10-18 00:33:57 -04:00 · 2021-10-18 00:33:57 -04:00 · 46b99f9ef6
commit 46b99f9ef6
parent af5dbe8db1 9f048fd869
2 changed files with 6 additions and 5 deletions
--- a/src/hw.accel.a
+++ b/src/hw.accel.a
@ -232,6 +232,7 @@ build_addon
 ; setspeed must be self-modified before use (setspeed_x and
 ; setspeed_y).
 ;
+; all return with Z=0
 ;-----------------------------------------------------------

 ; Function #1: Apple IIc+
@ -250,17 +251,17 @@ iicplus !pseudopc DisableAccelerator {

        ; cgga calls save X and Y regs but sets $0 to 0
        ; (this will get a laugh from C programmers)
+         php
         lda   $0
         pha
-         php
         sei             ; timing sensitive
         jsr   @jiggerypokery
         lda   gMachineInDHGRMode
         bne   +         ; DHGR mode doesn't need fix
         sta   $C05B     ; fix HGR-mode colouring
-+        plp             ; restore interrupt state
-         pla
+        pla
         sta   $0
+         plp             ; restore interrupt state
         rts

@jiggerypokery
--- a/src/hw.accel.lc2.a
+++ b/src/hw.accel.lc2.a
@ -10,8 +10,8 @@

 EnableAcceleratorAndSwitchToBank1
         jsr   EnableAccelerator
-         jmp   SwitchToBank1
+         bne   +                     ; always taken

 DisableAcceleratorAndSwitchToBank1
         jsr   DisableAccelerator
-         jmp   SwitchToBank1
+        jmp   SwitchToBank1