Commit db9b49d0 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Use new OS_Memory 16 items for calculating correct system workspace & hardware/system size

Detail:
  s/Switcher - Calculate system workspace as the sum of ZeroPage, ScratchSpace and DebuggerSpace sizes. This fixes the value being 4KB smaller than it should be when high processor vectors are in use (since the debugger is currently given a page of its own for that case). Also include processor vector page (if any) in hardware/system total (currently not needed, but may be in future)
Admin:
  Tested on Raspberry Pi
  Values listed in system memory section now total up correctly


Version 1.45. Tagged as 'Switcher-1_45'
parent 17cc19c4
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.44"
Module_Version SETA 144
Module_MajorVersion SETS "1.45"
Module_Version SETA 145
Module_MinorVersion SETS ""
Module_Date SETS "27 Jan 2015"
Module_ApplicationDate SETS "27-Jan-15"
Module_Date SETS "17 Jul 2015"
Module_ApplicationDate SETS "17-Jul-15"
Module_ComponentName SETS "Switcher"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Switcher"
Module_FullVersion SETS "1.44"
Module_HelpVersion SETS "1.44 (27 Jan 2015)"
Module_FullVersion SETS "1.45"
Module_HelpVersion SETS "1.45 (17 Jul 2015)"
END
/* (1.44)
/* (1.45)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.44
#define Module_MajorVersion_CMHG 1.45
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 27 Jan 2015
#define Module_Date_CMHG 17 Jul 2015
#define Module_MajorVersion "1.44"
#define Module_Version 144
#define Module_MajorVersion "1.45"
#define Module_Version 145
#define Module_MinorVersion ""
#define Module_Date "27 Jan 2015"
#define Module_Date "17 Jul 2015"
#define Module_ApplicationDate "27-Jan-15"
#define Module_ApplicationDate "17-Jul-15"
#define Module_ComponentName "Switcher"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Switcher"
#define Module_FullVersion "1.44"
#define Module_HelpVersion "1.44 (27 Jan 2015)"
#define Module_LibraryVersionInfo "1:44"
#define Module_FullVersion "1.45"
#define Module_HelpVersion "1.45 (17 Jul 2015)"
#define Module_LibraryVersionInfo "1:45"
......@@ -2486,8 +2486,17 @@ gotcounts
SWI XOS_Memory
ADDVC r9, r9, r3
STR r9, [sp, #(ic_memman-ic_sys1)*4]
MOV r0, #32*1024
STR r0, [sp, #(ic_syswork-ic_sys1)*4] ; zero page workspace, fixed size.
LDR r0, =&C10 ; ZeroPage
SWI XOS_Memory
MOVVC r9, r3
LDRVC r0, =&F10 ; ScratchSpace
SWIVC XOS_Memory
ADDVC r9, r9, r3
LDRVC r0, =&E10 ; DebuggerSpace
SWIVC XOS_Memory
ADDVC r9, r9, r3
MOVVS r9, #32*1024 ; ZeroPage+ScratchSpace+DebuggerSpace circa RISC OS 5.22
STR r9, [sp, #(ic_syswork-ic_sys1)*4]
MOV r9, #32*1024
LDR r0, =&110 ; cursor/system/sound
SWI XOS_Memory
......@@ -2501,6 +2510,9 @@ gotcounts
LDR r0, =&A10 ; Kernel buffers
SWI XOS_Memory
ADDVC r9, r9, r3
LDR r0, =&D10 ; Processor vectors
SWI XOS_Memory
ADDVC r9, r9, r3
STR r9, [sp, #(ic_hardware-ic_sys1)*4]
MOV r0, #0 ; system heap
SWI XOS_ReadDynamicArea
......
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