From 23c9ffecc38186cae2426e05c8abdff827ebe724 Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <jlee@gitlab.riscosopen.org>
Date: Sun, 20 Feb 2011 01:24:14 +0000
Subject: [PATCH] Tweak HAL_ExtMachineID to take the buffer pointer in R0
instead of R1
Detail:
s/Middle, s/PMF/osinit - Kernel now passes the buffer pointer to the HAL in R0 instead of R1, for ATPCS compliance.
Admin:
Tested on rev A2 BB-xM
Version 5.35, 4.79.2.98.2.35. Tagged as 'Kernel-5_35-4_79_2_98_2_35'
---
VersionASM | 6 +++---
VersionNum | 8 ++++----
s/Middle | 4 ++--
s/PMF/osinit | 8 ++++----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/VersionASM b/VersionASM
index d24106a..230f742 100644
--- a/VersionASM
+++ b/VersionASM
@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
-Module_MinorVersion SETS "4.79.2.98.2.34"
+Module_MinorVersion SETS "4.79.2.98.2.35"
Module_Date SETS "20 Feb 2011"
Module_ApplicationDate SETS "20-Feb-11"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.98.2.34)"
-Module_HelpVersion SETS "5.35 (20 Feb 2011) 4.79.2.98.2.34"
+Module_FullVersion SETS "5.35 (4.79.2.98.2.35)"
+Module_HelpVersion SETS "5.35 (20 Feb 2011) 4.79.2.98.2.35"
END
diff --git a/VersionNum b/VersionNum
index 5896276..fb6a928 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,12 +5,12 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.98.2.34
+#define Module_MinorVersion_CMHG 4.79.2.98.2.35
#define Module_Date_CMHG 20 Feb 2011
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.98.2.34"
+#define Module_MinorVersion "4.79.2.98.2.35"
#define Module_Date "20 Feb 2011"
#define Module_ApplicationDate "20-Feb-11"
@@ -18,6 +18,6 @@
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.98.2.34)"
-#define Module_HelpVersion "5.35 (20 Feb 2011) 4.79.2.98.2.34"
+#define Module_FullVersion "5.35 (4.79.2.98.2.35)"
+#define Module_HelpVersion "5.35 (20 Feb 2011) 4.79.2.98.2.35"
#define Module_LibraryVersionInfo "5:35"
diff --git a/s/Middle b/s/Middle
index 8302e80..b37a483 100644
--- a/s/Middle
+++ b/s/Middle
@@ -2026,8 +2026,8 @@ RSI_DebugRX
120
Push "r1-r3,r9,r14"
- MOV R0,#0 ; Set R0 to 0, in case HAL_ExtMachineID isn't implemented
- AddressHAL R0
+ AddressHAL
+ MOV R0, R1 ; HAL takes the buffer pointer in R0
CallHAL HAL_ExtMachineID
Pull "r1-r3,r9,r14"
ExitSWIHandler
diff --git a/s/PMF/osinit b/s/PMF/osinit
index 06f8429..49296d1 100644
--- a/s/PMF/osinit
+++ b/s/PMF/osinit
@@ -1200,10 +1200,10 @@ ReadUniqueID
CMP r0, #0
BEQ %FT10
MOV r2, sp
- SUB r1, r2, r0
- BIC r1, r1, #3
- MOV sp, r1
- Push "r1,r2" ; Remember old SP, buffer pointer
+ SUB r0, r2, r0
+ BIC r0, r0, #3
+ MOV sp, r0
+ Push "r0,r2" ; Remember old SP, buffer pointer
CallHAL HAL_ExtMachineID
Pull "r1"
MOV r2, #0
--
GitLab