Commit 3db3658e authored by John Ballance's avatar John Ballance
Browse files

Ensure thet usrblk is valid before checking fast pollwords

Details:
  s.Wimp03 : lines 502 to 505 moved 4 lines later
Admin:
  Tested in rom at Castle. fix believed benign at Tematic


Version 4.93. Tagged as 'Wimp-4_93'
parent 4c0db650
;
; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.2.
; Last processed by srccommit version: 1.68.
;
GBLS Module_MajorVersion
GBLA Module_Version
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "4.92"
Module_Version SETA 492
Module_MajorVersion SETS "4.93"
Module_Version SETA 493
Module_MinorVersion SETS ""
Module_Date SETS "05 Jul 2004"
Module_ApplicationDate SETS "05-Jul-04"
Module_Date SETS "12 Aug 2004"
Module_ApplicationDate SETS "12-Aug-04"
Module_ComponentName SETS "Wimp"
Module_ComponentPath SETS "RiscOS/Sources/Desktop/Wimp"
Module_FullVersion SETS "4.92"
Module_HelpVersion SETS "4.92 (05 Jul 2004)"
Module_FullVersion SETS "4.93"
Module_HelpVersion SETS "4.93 (12 Aug 2004)"
END
/* (4.92)
/* (4.93)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.2.
* Last processed by srccommit version: 1.68.
*
*/
#define Module_MajorVersion_CMHG 4.92
#define Module_MajorVersion_CMHG 4.93
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 05 Jul 2004
#define Module_Date_CMHG 12 Aug 2004
#define Module_MajorVersion "4.92"
#define Module_Version 492
#define Module_MajorVersion "4.93"
#define Module_Version 493
#define Module_MinorVersion ""
#define Module_Date "05 Jul 2004"
#define Module_Date "12 Aug 2004"
#define Module_ApplicationDate "05-Jul-04"
#define Module_ApplicationDate "12-Aug-04"
#define Module_ComponentName "Wimp"
#define Module_ComponentPath "RiscOS/Sources/Desktop/Wimp"
#define Module_FullVersion "4.92"
#define Module_HelpVersion "4.92 (05 Jul 2004)"
#define Module_LibraryVersionInfo "4:92"
#define Module_FullVersion "4.93"
#define Module_HelpVersion "4.93 (12 Aug 2004)"
#define Module_LibraryVersionInfo "4:93"
......@@ -513,14 +513,14 @@ repollwimp
TSTNE R14, #PortableFeature_Idle ; and Portable_Idle works
SWINE XPortable_Idle ; then go dormant until next interrupt or centi-second tick
]
MOV R0,#1
BL scanpollwords ; scan high-priority tasks
BNE ExitPoll
LDR R14,taskhandle ; get userblk back (may be corrupted)
LDR R14,[wsptr,R14]
LDR userblk,[R14,#task_registers+4*1]
;
MOV R0,#1
BL scanpollwords ; scan high-priority tasks
BNE ExitPoll
LDR R2,headpointer ; are there any outstanding messages?
CMP R2,#nullptr
BNE returnmessage
......
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