diff --git a/VersionASM b/VersionASM index 40adfef5e58b33d8ecdbb70a131e9ae4f3200ade..046b77e05786b700f687f2bda64f2dadc4a20b1c 100644 --- a/VersionASM +++ b/VersionASM @@ -11,13 +11,13 @@ GBLS Module_HelpVersion GBLS Module_ComponentName GBLS Module_ComponentPath -Module_MajorVersion SETS "5.10" -Module_Version SETA 510 +Module_MajorVersion SETS "5.11" +Module_Version SETA 511 Module_MinorVersion SETS "" -Module_Date SETS "04 Dec 2010" -Module_ApplicationDate SETS "04-Dec-10" +Module_Date SETS "01 Feb 2011" +Module_ApplicationDate SETS "01-Feb-11" Module_ComponentName SETS "Wimp" Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Wimp" -Module_FullVersion SETS "5.10" -Module_HelpVersion SETS "5.10 (04 Dec 2010)" +Module_FullVersion SETS "5.11" +Module_HelpVersion SETS "5.11 (01 Feb 2011)" END diff --git a/VersionNum b/VersionNum index 5be7979ac473a49ac7a21d791cc39f2c630ea225..ac2fa54d0288ee00fcc6737253753cad68564fd3 100644 --- a/VersionNum +++ b/VersionNum @@ -1,23 +1,23 @@ -/* (5.10) +/* (5.11) * * This file is automatically maintained by srccommit, do not edit manually. * Last processed by srccommit version: 1.1. * */ -#define Module_MajorVersion_CMHG 5.10 +#define Module_MajorVersion_CMHG 5.11 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 04 Dec 2010 +#define Module_Date_CMHG 01 Feb 2011 -#define Module_MajorVersion "5.10" -#define Module_Version 510 +#define Module_MajorVersion "5.11" +#define Module_Version 511 #define Module_MinorVersion "" -#define Module_Date "04 Dec 2010" +#define Module_Date "01 Feb 2011" -#define Module_ApplicationDate "04-Dec-10" +#define Module_ApplicationDate "01-Feb-11" #define Module_ComponentName "Wimp" #define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Wimp" -#define Module_FullVersion "5.10" -#define Module_HelpVersion "5.10 (04 Dec 2010)" -#define Module_LibraryVersionInfo "5:10" +#define Module_FullVersion "5.11" +#define Module_HelpVersion "5.11 (01 Feb 2011)" +#define Module_LibraryVersionInfo "5:11" diff --git a/s/Wimp03 b/s/Wimp03 index f636edc7f9dd7f282a46a6c23d39b9265762dfef..cc655d5e0cb106d57fd2e9b3e1a30cb9ad6e157e 100644 --- a/s/Wimp03 +++ b/s/Wimp03 @@ -437,10 +437,10 @@ SWIWimp_Poll STR userblk,[R4,#task_registers+4*1] ; and user R1 STR R2,[R4,#task_registers+4*2] ; and target time ; -; save VFP context. Can't save lazily since it might be in application space. +; save VFP context, lazily if possible ; MOV R0,#0 - MOV R1,#0 + MOV R1,#VFPSupport_ChangeContext_Lazy+VFPSupport_ChangeContext_AppSpace SWI XVFPSupport_ChangeContext MOVVS R0,#0 ; Ignore error (probably means VFPSupport isn't loaded) STR R0,[R4,#task_vfpcontext] diff --git a/s/Wimp07 b/s/Wimp07 index 51b73024530b448a315f5cd84b0621107050acb4..e5207243f16a621104a0ac69829ad6fc0d990497 100644 --- a/s/Wimp07 +++ b/s/Wimp07 @@ -747,11 +747,11 @@ SWIWimp_StartTask BLVC saveFPregs ; R4 -> task block BVS ExitWimp ; -; save VFP context. Can't save lazily since it might be in application space. +; save VFP context, lazily if possible ; Push "R0-R1" MOV R0,#0 - MOV R1,#0 + MOV R1,#VFPSupport_ChangeContext_Lazy+VFPSupport_ChangeContext_AppSpace SWI XVFPSupport_ChangeContext MOVVS R0,#0 ; Ignore error (probably means VFPSupport isn't loaded) STR R0,[R4,#task_vfpcontext]