From 65b2059fb4f8be363fcaa6c6bcd26b2dd8a73f8e Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@gitlab.riscosopen.org>
Date: Fri, 18 May 2012 10:27:03 +0000
Subject: [PATCH] Merged across the bugfix from the HAL branch, revision
Kernel-5_35-4_79_2_148
Version 5.35, 4.79.2.147.2.4. Tagged as 'Kernel-5_35-4_79_2_147_2_4'
---
VersionASM | 6 +++---
VersionNum | 8 ++++----
s/Kernel | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/VersionASM b/VersionASM
index 3658dac..5e77ba6 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.147.2.3"
+Module_MinorVersion SETS "4.79.2.147.2.4"
Module_Date SETS "18 May 2012"
Module_ApplicationDate SETS "18-May-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.147.2.3)"
-Module_HelpVersion SETS "5.35 (18 May 2012) 4.79.2.147.2.3"
+Module_FullVersion SETS "5.35 (4.79.2.147.2.4)"
+Module_HelpVersion SETS "5.35 (18 May 2012) 4.79.2.147.2.4"
END
diff --git a/VersionNum b/VersionNum
index 46c95e9..4893879 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,12 +5,12 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.147.2.3
+#define Module_MinorVersion_CMHG 4.79.2.147.2.4
#define Module_Date_CMHG 18 May 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.147.2.3"
+#define Module_MinorVersion "4.79.2.147.2.4"
#define Module_Date "18 May 2012"
#define Module_ApplicationDate "18-May-12"
@@ -18,6 +18,6 @@
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.147.2.3)"
-#define Module_HelpVersion "5.35 (18 May 2012) 4.79.2.147.2.3"
+#define Module_FullVersion "5.35 (4.79.2.147.2.4)"
+#define Module_HelpVersion "5.35 (18 May 2012) 4.79.2.147.2.4"
#define Module_LibraryVersionInfo "5:35"
diff --git a/s/Kernel b/s/Kernel
index e5edc6d..69a020e 100644
--- a/s/Kernel
+++ b/s/Kernel
@@ -1512,7 +1512,7 @@ NoIrqVecSwiDespatch ROUT
ORR r11, r11, r14 ; add in CCs
|
MOV r14, r14, LSR #28
- BIC r11, r11, #I32_bit ; enable IRQs
+ ORR r11, r11, #I32_bit ; disable IRQs
BFI r11, r14, #28, #4 ; add in caller's CCs
]
MSR CPSR_cf, r11 ; and set it all up
--
GitLab