From ace0a205f577f9d53f4ab3b48ee5b038052f533e Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <jlee@gitlab.riscosopen.org>
Date: Mon, 17 Aug 2015 23:33:37 +0000
Subject: [PATCH] Fix examination of L2 cache
Detail:
s/ARMops - In Analyse_WB_CR7_Lx, we need to check against Cache_Lx_MaxLevel*2, because the cache size selection register counts I + D caches separately
Admin:
Tested on IGEPv5
Version 5.35, 4.79.2.281. Tagged as 'Kernel-5_35-4_79_2_281'
---
VersionASM | 10 +++++-----
VersionNum | 14 +++++++-------
s/ARMops | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/VersionASM b/VersionASM
index 0c92ca9..ea91a12 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.280"
-Module_Date SETS "15 Aug 2015"
-Module_ApplicationDate SETS "15-Aug-15"
+Module_MinorVersion SETS "4.79.2.281"
+Module_Date SETS "18 Aug 2015"
+Module_ApplicationDate SETS "18-Aug-15"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.280)"
-Module_HelpVersion SETS "5.35 (15 Aug 2015) 4.79.2.280"
+Module_FullVersion SETS "5.35 (4.79.2.281)"
+Module_HelpVersion SETS "5.35 (18 Aug 2015) 4.79.2.281"
END
diff --git a/VersionNum b/VersionNum
index daabf0d..382e559 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.280
-#define Module_Date_CMHG 15 Aug 2015
+#define Module_MinorVersion_CMHG 4.79.2.281
+#define Module_Date_CMHG 18 Aug 2015
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.280"
-#define Module_Date "15 Aug 2015"
+#define Module_MinorVersion "4.79.2.281"
+#define Module_Date "18 Aug 2015"
-#define Module_ApplicationDate "15-Aug-15"
+#define Module_ApplicationDate "18-Aug-15"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.280)"
-#define Module_HelpVersion "5.35 (15 Aug 2015) 4.79.2.280"
+#define Module_FullVersion "5.35 (4.79.2.281)"
+#define Module_HelpVersion "5.35 (18 Aug 2015) 4.79.2.281"
#define Module_LibraryVersionInfo "5:35"
diff --git a/s/ARMops b/s/ARMops
index 420bd8f..39aacc0 100644
--- a/s/ARMops
+++ b/s/ARMops
@@ -642,7 +642,7 @@ Analyse_WB_CR7_Lx
TST a1, #7
ADD a3, a3, #1
MOVNE a1, a1, LSR #3
- CMP a3, #Cache_Lx_MaxLevel ; Stop at the last level we support
+ CMP a3, #Cache_Lx_MaxLevel*2 ; Stop at the last level we support
ADD a2, a2, #4
BLT %BT10
--
GitLab