From c14560a07be3523be62fc5aab84e8ad045c09ba4 Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <jlee@gitlab.riscosopen.org>
Date: Sun, 24 Jun 2012 21:15:35 +0000
Subject: [PATCH] Fix callback and breakpoint environment handlers to work with
zero page relocation
Detail:
s/Middle - Callback and breakpoint environment handler workspace is now specified as being ZeroPage relative
Admin:
Tested on Raspberry Pi with high processor vectors
Version 5.35, 4.79.2.147.2.10. Tagged as 'Kernel-5_35-4_79_2_147_2_10'
---
VersionASM | 10 +++++-----
VersionNum | 14 +++++++-------
s/Middle | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/VersionASM b/VersionASM
index 883b3d9..f0273ad 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.9"
-Module_Date SETS "05 Jun 2012"
-Module_ApplicationDate SETS "05-Jun-12"
+Module_MinorVersion SETS "4.79.2.147.2.10"
+Module_Date SETS "24 Jun 2012"
+Module_ApplicationDate SETS "24-Jun-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.147.2.9)"
-Module_HelpVersion SETS "5.35 (05 Jun 2012) 4.79.2.147.2.9"
+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"
END
diff --git a/VersionNum b/VersionNum
index f93cdd2..9bec503 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.147.2.9
-#define Module_Date_CMHG 05 Jun 2012
+#define Module_MinorVersion_CMHG 4.79.2.147.2.10
+#define Module_Date_CMHG 24 Jun 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.147.2.9"
-#define Module_Date "05 Jun 2012"
+#define Module_MinorVersion "4.79.2.147.2.10"
+#define Module_Date "24 Jun 2012"
-#define Module_ApplicationDate "05-Jun-12"
+#define Module_ApplicationDate "24-Jun-12"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.147.2.9)"
-#define Module_HelpVersion "5.35 (05 Jun 2012) 4.79.2.147.2.9"
+#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_LibraryVersionInfo "5:35"
diff --git a/s/Middle b/s/Middle
index 3b84930..5560ddd 100644
--- a/s/Middle
+++ b/s/Middle
@@ -435,7 +435,7 @@ DEFHN2 MOV R12, R14
MOV R2, #0
ADR R3, EVENTH
SWI XOS_Control
- LDR R0, =DUMPER
+ LDR R0, =ZeroPage+DUMPER
ADR R1, NOCALL
SWI XOS_CallBack
ADRL R0, CLIEXIT
@@ -446,7 +446,7 @@ DEFHN2 MOV R12, R14
ADRL R6, ABORTD
ADRL R7, ADDREX
SWI XOS_SetEnv
- LDR R0, =DUMPER
+ LDR R0, =ZeroPage+DUMPER
ADR R1, DEFBRK
SWI XOS_BreakCtrl
ADRL R0, NoHighSWIHandler
@@ -1260,11 +1260,11 @@ defhantab
& NOCALL ; CallBackHandler
& 0
- & DUMPER
+ & ZeroPage+DUMPER
& DEFBRK ; BreakPointHandler
& 0
- & DUMPER
+ & ZeroPage+DUMPER
& ESCAPH ; EscapeHandler
& 0
--
GitLab