From 5db5ffa39a91222e0e65e5fa89d1c0ee5bdbe975 Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <jlee@gitlab.riscosopen.org>
Date: Thu, 6 Aug 2015 20:11:25 +0000
Subject: [PATCH] Fix DebuggerSpace page to be cacheable
Detail:
s/HAL - A typo seems to have resulted in the HiProcVecs DebuggerSpace page being mapped in as NCB instead of CB. Fix it.
Admin:
Untested.
Version 5.35, 4.79.2.274. Tagged as 'Kernel-5_35-4_79_2_274'
---
VersionASM | 10 +++++-----
VersionNum | 14 +++++++-------
s/HAL | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/VersionASM b/VersionASM
index d929fc8..a9c5c84 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.273"
-Module_Date SETS "05 Aug 2015"
-Module_ApplicationDate SETS "05-Aug-15"
+Module_MinorVersion SETS "4.79.2.274"
+Module_Date SETS "06 Aug 2015"
+Module_ApplicationDate SETS "06-Aug-15"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.273)"
-Module_HelpVersion SETS "5.35 (05 Aug 2015) 4.79.2.273"
+Module_FullVersion SETS "5.35 (4.79.2.274)"
+Module_HelpVersion SETS "5.35 (06 Aug 2015) 4.79.2.274"
END
diff --git a/VersionNum b/VersionNum
index d87b35f..6d07dff 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.273
-#define Module_Date_CMHG 05 Aug 2015
+#define Module_MinorVersion_CMHG 4.79.2.274
+#define Module_Date_CMHG 06 Aug 2015
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.273"
-#define Module_Date "05 Aug 2015"
+#define Module_MinorVersion "4.79.2.274"
+#define Module_Date "06 Aug 2015"
-#define Module_ApplicationDate "05-Aug-15"
+#define Module_ApplicationDate "06-Aug-15"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.273)"
-#define Module_HelpVersion "5.35 (05 Aug 2015) 4.79.2.273"
+#define Module_FullVersion "5.35 (4.79.2.274)"
+#define Module_HelpVersion "5.35 (06 Aug 2015) 4.79.2.274"
#define Module_LibraryVersionInfo "5:35"
diff --git a/s/HAL b/s/HAL
index b985308..f765d00 100644
--- a/s/HAL
+++ b/s/HAL
@@ -1277,7 +1277,7 @@ MMUon_nol1ptoverlap
[ HiProcVecs
; Map in DebuggerSpace
LDR a1, =DebuggerSpace
- ORR a2, v5, #AP_Read * L2X_APMult
+ ORR a2, v4, #AP_Read * L2X_APMult
LDR a3, =(DebuggerSpace_Size + &FFF) :AND: &FFFFF000
BL Init_MapInRAM
]
--
GitLab