From bd172cc55ffcaf356078b5ee74da75f7b6e7bff3 Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <jlee@gitlab.riscosopen.org>
Date: Tue, 26 Jun 2012 23:04:44 +0000
Subject: [PATCH] Fix VMSAv6 prefetch abort handler to work with zero page
relocation
Detail:
s/VMSAv6 - Prefetch abort handler address now looked up as ZeroPage-relative
Admin:
Tested on Raspberry Pi with high processor vectors
Version 5.35, 4.79.2.147.2.11. Tagged as 'Kernel-5_35-4_79_2_147_2_11'
---
VersionASM | 10 +++++-----
VersionNum | 14 +++++++-------
s/VMSAv6 | 10 ++--------
3 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/VersionASM b/VersionASM
index f0273ad..57b399f 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.10"
-Module_Date SETS "24 Jun 2012"
-Module_ApplicationDate SETS "24-Jun-12"
+Module_MinorVersion SETS "4.79.2.147.2.11"
+Module_Date SETS "27 Jun 2012"
+Module_ApplicationDate SETS "27-Jun-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.147.2.10)"
-Module_HelpVersion SETS "5.35 (24 Jun 2012) 4.79.2.147.2.10"
+Module_FullVersion SETS "5.35 (4.79.2.147.2.11)"
+Module_HelpVersion SETS "5.35 (27 Jun 2012) 4.79.2.147.2.11"
END
diff --git a/VersionNum b/VersionNum
index 9bec503..818fb28 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.147.2.10
-#define Module_Date_CMHG 24 Jun 2012
+#define Module_MinorVersion_CMHG 4.79.2.147.2.11
+#define Module_Date_CMHG 27 Jun 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.147.2.10"
-#define Module_Date "24 Jun 2012"
+#define Module_MinorVersion "4.79.2.147.2.11"
+#define Module_Date "27 Jun 2012"
-#define Module_ApplicationDate "24-Jun-12"
+#define Module_ApplicationDate "27-Jun-12"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.147.2.10)"
-#define Module_HelpVersion "5.35 (24 Jun 2012) 4.79.2.147.2.10"
+#define Module_FullVersion "5.35 (4.79.2.147.2.11)"
+#define Module_HelpVersion "5.35 (27 Jun 2012) 4.79.2.147.2.11"
#define Module_LibraryVersionInfo "5:35"
diff --git a/s/VMSAv6 b/s/VMSAv6
index 7d65228..3ddf8b5 100644
--- a/s/VMSAv6
+++ b/s/VMSAv6
@@ -37,12 +37,6 @@ SixteenMByte EQU (1024*1024 * 16)
KEEP
-; *****************************************************************************
-
-; mjs Oct 2000 kernel/HAL split
-; SetDAG stuff is no more, routines like SetVinit now call equivalent HAL
-; routine
-
; **************** CAM manipulation utility routines ***********************************
; **************************************************************************************
@@ -319,8 +313,8 @@ SSETMEMC ROUT
MOV r1, #0 ; no funny business with DPMS
MOV r0, #0
MOV r1
- mjsAddressHAL
- mjsCallHAL HAL_Video_SetBlank
+ AddressHAL
+ CallHAL HAL_Video_SetBlank
Pull "r0-r3, r9, r14"
]
--
GitLab