Commit 1eb2003d authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Make compatible with zero page relocation

Detail:
  s/Taskman - Attempt to get DomainId pointer from OS_ReadSysInfo 6 before falling back on legacy address. Fix NiceNess code to not pass null pointers to OS_ReadUnsigned.
Admin:
  Tested on rev A2 BB-xM


Version 0.73. Tagged as 'TaskWindow-0_73'
parent 2286ef03
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.72"
Module_Version SETA 72
Module_MajorVersion SETS "0.73"
Module_Version SETA 73
Module_MinorVersion SETS ""
Module_Date SETS "19 Jan 2010"
Module_ApplicationDate SETS "19-Jan-10"
Module_Date SETS "04 Aug 2011"
Module_ApplicationDate SETS "04-Aug-11"
Module_ComponentName SETS "TaskWindow"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/TaskWindow"
Module_FullVersion SETS "0.72"
Module_HelpVersion SETS "0.72 (19 Jan 2010)"
Module_FullVersion SETS "0.73"
Module_HelpVersion SETS "0.73 (04 Aug 2011)"
END
/* (0.72)
/* (0.73)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.72
#define Module_MajorVersion_CMHG 0.73
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 19 Jan 2010
#define Module_Date_CMHG 04 Aug 2011
#define Module_MajorVersion "0.72"
#define Module_Version 72
#define Module_MajorVersion "0.73"
#define Module_Version 73
#define Module_MinorVersion ""
#define Module_Date "19 Jan 2010"
#define Module_Date "04 Aug 2011"
#define Module_ApplicationDate "19-Jan-10"
#define Module_ApplicationDate "04-Aug-11"
#define Module_ComponentName "TaskWindow"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/TaskWindow"
#define Module_FullVersion "0.72"
#define Module_HelpVersion "0.72 (19 Jan 2010)"
#define Module_LibraryVersionInfo "0:72"
#define Module_FullVersion "0.73"
#define Module_HelpVersion "0.73 (04 Aug 2011)"
#define Module_LibraryVersionInfo "0:73"
......@@ -83,6 +83,7 @@
GET Hdr:MsgTrans
GET Hdr:FPEmulator
GET Hdr:PublicWS
GET Hdr:OSRSI6
GET VersionASM
......@@ -151,7 +152,6 @@ DebugStart SETL {FALSE}
GBLL FixDomain
FixDomain SETL {TRUE}
WimpDomain * DomainId
GBLL FixControl
FixControl SETL {TRUE}
......@@ -633,7 +633,7 @@ Code_InitEntry ROUT
MOV r0, #6
MOV r1, #0
MOV r2, #18
MOV r2, #OSRSI6_Danger_SWIDispatchTable
SWI XOS_ReadSysInfo
MOVVS r2, #0
CMP r2, #0
......@@ -1540,7 +1540,17 @@ nowimpstarttask ROUT
STR r8, InPollWimpFn
]
[ FixDomain
LDR r0, [r8, #WimpDomain]
Push "r1-r2"
MOV r0, #6
MOV r1, #0
MOV r2, #OSRSI6_DomainId
SWI XOS_ReadSysInfo
MOVVS r2, #0
CMP r2, #0
LDREQ r2, =Legacy_DomainId
STR r2, WimpDomain
LDR r0, [r2]
Pull "r1-r2"
STR r0, MyDomain
]
[ NiceNess
......@@ -1623,8 +1633,11 @@ nowimpstarttask ROUT
[ NiceNess
MOV r0, #10
LDR r1, key_nice
CMP r1, #0
BEQ %FT22
SWI XOS_ReadUnsigned
STRVC r2, Nice
22
]
;
; Now initialise the wimp
......@@ -5111,8 +5124,8 @@ CheckDomain ROUT
;
Push "r0, lr"
MOV r0, #0
LDR r0, [r0, #WimpDomain]
LDR r0, WimpDomain
LDR r0, [r0]
LDR r14, MyDomain
TEQ r0, r14
LDREQ r0, PassOnVectors
......@@ -5486,6 +5499,7 @@ ChildTask Word ; Our own id, to tell if messages to us.
PassOnVectors Word
[ FixDomain
MyDomain Word
WimpDomain Word
]
WHILE ((:INDEX: @) :MOD: 16) <> 0
# 4
......
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