From 8fd9657df3f5d4b421b5110a8a90a9399279cc2a Mon Sep 17 00:00:00 2001
From: Simon Forrest <sforrest@gitlab.riscosopen.org>
Date: Mon, 8 May 2000 17:05:47 +0000
Subject: [PATCH] * Kernel failed to assemble on Lazarus builds. Single
instruction change should cure this.
Detail:
* Lazarus builds of the Kernel failed with the following error:
Immediate value out of range at line 458 in file "s.NewReset"
ADR R2, IRQ_Test_CTRL_or_R_Pressed
This is due to the ADR going out of range. Changed to use ADDR
macro instead to rectify this.
Admin:
* Untested at time of check-in; to be verified in next Lazarus development
build.
Version 5.25. Tagged as 'Kernel-5_25'
---
VersionASM | 8 ++++----
VersionNum | 14 +++++++-------
s/NewReset | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/VersionASM b/VersionASM
index de1e017f..3e721d9d 100644
--- a/VersionASM
+++ b/VersionASM
@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
-Module_MajorVersion SETS "5.24"
-Module_Version SETA 524
+Module_MajorVersion SETS "5.25"
+Module_Version SETA 525
Module_MinorVersion SETS ""
-Module_Date SETS "20 Apr 2000"
-Module_FullVersion SETS "5.24"
+Module_Date SETS "08 May 2000"
+Module_FullVersion SETS "5.25"
END
diff --git a/VersionNum b/VersionNum
index f687d014..6b02bde8 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,15 +1,15 @@
-/* (5.24)
+/* (5.25)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
-#define Module_MajorVersion_CMHG 5.24
+#define Module_MajorVersion_CMHG 5.25
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 20 Apr 2000
+#define Module_Date_CMHG 08 May 2000
-#define Module_MajorVersion "5.24"
-#define Module_Version 524
+#define Module_MajorVersion "5.25"
+#define Module_Version 525
#define Module_MinorVersion ""
-#define Module_Date "20 Apr 2000"
+#define Module_Date "08 May 2000"
-#define Module_FullVersion "5.24"
+#define Module_FullVersion "5.25"
diff --git a/s/NewReset b/s/NewReset
index eb2686ea..fc46123c 100644
--- a/s/NewReset
+++ b/s/NewReset
@@ -469,7 +469,7 @@ SetUpKbdReturn
MOV R3, #0
STR R2, [R3, #&18] ; but hopefully by the same value!
- ADR R2, IRQ_Test_CTRL_or_R_Pressed
+ ADDR R2, IRQ_Test_CTRL_or_R_Pressed ; (could use ADRL, but ADDR macro is nicer)
STR R2, [R3, #InitKbdHandler] ; instruction is now a LDR PC,InitKbdHandler
ORR r0, r0, #SVC32_mode ; switch into SVC32
--
GitLab