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

Fix error handling for sparse dynamic area resize operations (for main HAL branch)

Detail:
  s/ChangeDyn - Swap CMP with TEQ to avoid accidental clobbering of V flag before its state is checked on return from a SWI. Errors encounterd during sparse dynamic area resize operations (OS_DynamicArea 9 & 10) should now be reported properly.
Admin:
  Not tested, but the same fix has been proven to work on the Cortex branch.


Version 5.35, 4.79.2.104. Tagged as 'Kernel-5_35-4_79_2_104'
parent 9e7233fb
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.103"
Module_Date SETS "07 Jun 2009"
Module_ApplicationDate SETS "07-Jun-09"
Module_MinorVersion SETS "4.79.2.104"
Module_Date SETS "22 Oct 2009"
Module_ApplicationDate SETS "22-Oct-09"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.103)"
Module_HelpVersion SETS "5.35 (07 Jun 2009) 4.79.2.103"
Module_FullVersion SETS "5.35 (4.79.2.104)"
Module_HelpVersion SETS "5.35 (22 Oct 2009) 4.79.2.104"
END
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.103
#define Module_Date_CMHG 07 Jun 2009
#define Module_MinorVersion_CMHG 4.79.2.104
#define Module_Date_CMHG 22 Oct 2009
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.103"
#define Module_Date "07 Jun 2009"
#define Module_MinorVersion "4.79.2.104"
#define Module_Date "22 Oct 2009"
#define Module_ApplicationDate "07-Jun-09"
#define Module_ApplicationDate "22-Oct-09"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.103)"
#define Module_HelpVersion "5.35 (07 Jun 2009) 4.79.2.103"
#define Module_FullVersion "5.35 (4.79.2.104)"
#define Module_HelpVersion "5.35 (22 Oct 2009) 4.79.2.104"
#define Module_LibraryVersionInfo "5:35"
......@@ -1731,7 +1731,7 @@ DynArea_SparseChange ; common entry point for claim and relea
CMP r4,#0
RSBEQ r1,r1,#0 ;batshrink for release, batgrow for claim
SWI XOS_ChangeDynamicArea
CMP r4,#0
TEQ r4,#0
RSBEQ r1,r1,#0
LDR r9,[r10,#DANode_Size]
ADD r9,r9,r1
......
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