Skip to content

GitLab

Commit 105674f6 authored by Ben Avison's avatar Ben Avison
Browse files

Fix stack imbalances 

Detail:
  In a couple of early exits from LookForHALRTC, R12 was missing from the
  pull macros.
Admin:
  Fix received from John Ballance.

Version 5.35, 4.79.2.147. Tagged as 'Kernel-5_35-4_79_2_147'
parent 5e11e665
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
VersionASM
View file @ 105674f6
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.146"
Module_Date SETS "15 Apr 2012"
Module_ApplicationDate SETS "15-Apr-12"
Module_MinorVersion SETS "4.79.2.147"
Module_Date SETS "26 Apr 2012"
Module_ApplicationDate SETS "26-Apr-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.146)"
Module_HelpVersion SETS "5.35 (15 Apr 2012) 4.79.2.146"
Module_FullVersion SETS "5.35 (4.79.2.147)"
Module_HelpVersion SETS "5.35 (26 Apr 2012) 4.79.2.147"
END
VersionNum
View file @ 105674f6
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.146
#define Module_Date_CMHG 15 Apr 2012
#define Module_MinorVersion_CMHG 4.79.2.147
#define Module_Date_CMHG 26 Apr 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.146"
#define Module_Date "15 Apr 2012"
#define Module_MinorVersion "4.79.2.147"
#define Module_Date "26 Apr 2012"
#define Module_ApplicationDate "15-Apr-12"
#define Module_ApplicationDate "26-Apr-12"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.146)"
#define Module_HelpVersion "5.35 (15 Apr 2012) 4.79.2.146"
#define Module_FullVersion "5.35 (4.79.2.147)"
#define Module_HelpVersion "5.35 (26 Apr 2012) 4.79.2.147"
#define Module_LibraryVersionInfo "5:35"
s/NewReset
View file @ 105674f6
......@@ -2421,9 +2421,9 @@ LookForHALRTC
MOV R8, #4
01
SWI XOS_Hardware
Pull "R0-R2,R8,PC",VS
Pull "R0-R2,R8,R12,PC",VS
CMP R1, #-1
Pull "R0-R2,R8,PC",EQ
Pull "R0-R2,R8,R12,PC",EQ
LDR R14, [R2, #HALDevice_Location]
; Currently, we only support devices located on IIC bus 0
CMP R14, #HALDeviceBus_Ser+HALDeviceSerBus_IIC
......
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