From a654e89d58d16b899cbcf93ed49fdb3865d66d55 Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <jlee@gitlab.riscosopen.org>
Date: Mon, 20 Jan 2014 21:32:30 +0000
Subject: [PATCH] Fix 32bitification error
Detail:
kernel/s/k_body - At CopyUpDone in _kernel_system(), a big block of conditional code was converted to unconditional as part of the 32bit conversion process. However one line for setting up the error handler remained conditional, potentially preventing the correct error buffer pointer being set when about to start the child task.
Admin:
Tested on BB-xM
Version 5.79. Tagged as 'RISC_OSLib-5_79'
---
VersionASM | 12 ++++++------
VersionNum | 20 ++++++++++----------
kernel/s/k_body | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/VersionASM b/VersionASM
index ed560e1..06b6b3a 100644
--- a/VersionASM
+++ b/VersionASM
@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
-Module_MajorVersion SETS "5.78"
-Module_Version SETA 578
+Module_MajorVersion SETS "5.79"
+Module_Version SETA 579
Module_MinorVersion SETS ""
-Module_Date SETS "24 Oct 2013"
-Module_ApplicationDate SETS "24-Oct-13"
+Module_Date SETS "20 Jan 2014"
+Module_ApplicationDate SETS "20-Jan-14"
Module_ComponentName SETS "RISC_OSLib"
Module_ComponentPath SETS "castle/RiscOS/Sources/Lib/RISC_OSLib"
-Module_FullVersion SETS "5.78"
-Module_HelpVersion SETS "5.78 (24 Oct 2013)"
+Module_FullVersion SETS "5.79"
+Module_HelpVersion SETS "5.79 (20 Jan 2014)"
END
diff --git a/VersionNum b/VersionNum
index 2999a56..92f97d2 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (5.78)
+/* (5.79)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
-#define Module_MajorVersion_CMHG 5.78
+#define Module_MajorVersion_CMHG 5.79
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 24 Oct 2013
+#define Module_Date_CMHG 20 Jan 2014
-#define Module_MajorVersion "5.78"
-#define Module_Version 578
+#define Module_MajorVersion "5.79"
+#define Module_Version 579
#define Module_MinorVersion ""
-#define Module_Date "24 Oct 2013"
+#define Module_Date "20 Jan 2014"
-#define Module_ApplicationDate "24-Oct-13"
+#define Module_ApplicationDate "20-Jan-14"
#define Module_ComponentName "RISC_OSLib"
#define Module_ComponentPath "castle/RiscOS/Sources/Lib/RISC_OSLib"
-#define Module_FullVersion "5.78"
-#define Module_HelpVersion "5.78 (24 Oct 2013)"
-#define Module_LibraryVersionInfo "5:78"
+#define Module_FullVersion "5.79"
+#define Module_HelpVersion "5.79 (20 Jan 2014)"
+#define Module_LibraryVersionInfo "5:79"
diff --git a/kernel/s/k_body b/kernel/s/k_body
index 2f757d1..79ac493 100644
--- a/kernel/s/k_body
+++ b/kernel/s/k_body
@@ -2329,7 +2329,7 @@ CopyUpDone
MOV r0, #Env_ErrorHandler
ADR r1, s_ErrHandler
MOV r2, v6
- ADDEQ r3, v6, #O_errorBuffer
+ ADD r3, v6, #O_errorBuffer
SWI ChangeEnv
MOV r0, #Env_ExitHandler
--
GitLab