Skip to content

GitLab

Commit b6c3d8fb authored by Ben Avison's avatar Ben Avison
Browse files

Should fix Alt-Escape so that it (a) clears the PendingAlt bit again, and 

(b) doesn't unbalance the SVC stack.

Version 5.35, 4.79.2.57. Tagged as 'Kernel-5_35-4_79_2_57'
parent d91e9420
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 16 deletions
VersionASM
View file @ b6c3d8fb
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.56"
Module_Date SETS "21 Feb 2003"
Module_ApplicationDate SETS "21-Feb-03"
Module_MinorVersion SETS "4.79.2.57"
Module_Date SETS "28 Feb 2003"
Module_ApplicationDate SETS "28-Feb-03"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.56)"
Module_HelpVersion SETS "5.35 (21 Feb 2003) 4.79.2.56"
Module_FullVersion SETS "5.35 (4.79.2.57)"
Module_HelpVersion SETS "5.35 (28 Feb 2003) 4.79.2.57"
END
VersionNum
View file @ b6c3d8fb
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.56
#define Module_Date_CMHG 21 Feb 2003
#define Module_MinorVersion_CMHG 4.79.2.57
#define Module_Date_CMHG 28 Feb 2003
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.56"
#define Module_Date "21 Feb 2003"
#define Module_MinorVersion "4.79.2.57"
#define Module_Date "28 Feb 2003"
#define Module_ApplicationDate "21-Feb-03"
#define Module_ApplicationDate "28-Feb-03"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.56)"
#define Module_HelpVersion "5.35 (21 Feb 2003) 4.79.2.56"
#define Module_FullVersion "5.35 (4.79.2.57)"
#define Module_HelpVersion "5.35 (28 Feb 2003) 4.79.2.57"
#define Module_LibraryVersionInfo "5:35"
s/PMF/key
View file @ b6c3d8fb
......@@ -580,6 +580,7 @@ OfferPostKeyStatusUpCall
MRS R11, CPSR
ORR R10, R11, #SVC_mode + I32_bit
MSR CPSR_c, R10
Push "R14"
MOV R3, R5
MOV R2, R12
B %BT10
......@@ -767,10 +768,11 @@ GenerateChar ROUT
BNE %FT21
TST R5, #KBStat_PendingAlt
MOVNE R5, R12
BICNE R5, R5, #KBStat_PendingAlt ; then cancel pending alt
BLNE OfferPostKeyStatusUpCall ; don't let them interfere
STROSB R5, KeyBdStatus, R6, NE ; and store back
BEQ %FT21
MOV R5, R12
BIC R5, R5, #KBStat_PendingAlt ; then cancel pending alt
BL OfferPostKeyStatusUpCall ; don't let them interfere
STROSB R5, KeyBdStatus, R6 ; and store back
21 TST R5, #KBStat_PendingAlt ; is there a pending Alt ?
BNE ProcessPendingAlt
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment