Fix ticket #142 (Escape key during *HELP)

2022-09-13 16:49:44 -04:00 · 2022-09-13 16:49:44 -04:00 · ac2a5d0974
parent a358b6cdea
commit ac2a5d0974
4 changed files with 5 additions and 4 deletions
--- a/applecorn.po
+++ b/applecorn.po
--- a/auxmem.chario.s
+++ b/auxmem.chario.s
@ -27,6 +27,7 @@
 * 12-Sep-2021 COPY calls new VDU entry point.
 * 15-Sep-2021 INKEY(0) tests once and returns immediately.
 * 30-Nov-2021 With *FX4,<>0 TAB returns $09, allows eg VIEW to work.
+* 13-Sep-2022 Fix bug in INKEY with misbalanced stack when Escape pressed
 * TO DO: CHKESC should go through translations before testing.


@ -197,9 +198,9 @@ INKEYOFF2    JSR   PUTCHRC                   ; Remove cursor
             BCS   INKEYOK3                  ; Timeout
             LDA   ESCFLAG                   ; Keypress, test for Escape
             ASL   A                         ; Cy=Escape flag
-             PLA                             ; Get char back
+INKEYOK3     PLA                             ; Get char back
             PLX                             ; Restore X,Y for key pressed
-INKEYOK3     PLY                             ; Or pop TimeOut
+             PLY                             ; Or pop TimeOut
             RTS
 * RDCH  Character read: CC, A=char, X=restored, Y=restored
 * RDCH  Escape:         CS, A=char, X=restored, Y=restored
--- a/auxmem.init.s
+++ b/auxmem.init.s
@ -204,7 +204,7 @@ BYTE00      BEQ   BYTE00A                    ; OSBYTE 0,0 - generate error
            RTS                              ; %000x1xxx host type, 'A'pple
 BYTE00A     BRK
            DB    $F7
-HELLO       ASC   'Applecorn MOS 2021-12-08'
+HELLO       ASC   'Applecorn MOS 2022-09-13'
            DB    $00                        ; Unify MOS messages


--- a/2
+++ b/2
@ -1 +1 @@
-mame -w apple2ee -sl7 cffa2 -harddisk1 ~/Personal/Development/Applecorn/applecorn.po
+mame -w apple2ee -debug -sl7 cffa2 -harddisk1 ~/Personal/Development/Applecorn/applecorn.po