From 4248980fd9211a5fca85fb39dd5b60443ee5e420 Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@gitlab.riscosopen.org>
Date: Tue, 2 Dec 2003 16:02:06 +0000
Subject: [PATCH] Fixed bug in KeyV handling: if it was called before the
keyboard handler was installed, it would abort reading from an address that
used to be in the logical copy of physical space on an IOMD machine. This
manifested itself during software-initiated resets as an abort during ROM
init, leaving you with an apparently dead machine.
Version 5.35, 4.79.2.61. Tagged as 'Kernel-5_35-4_79_2_61'
---
VersionASM | 12 ++++++------
VersionNum | 16 ++++++++--------
s/PMF/key | 2 ++
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/VersionASM b/VersionASM
index 3b58d0f..3680a49 100644
--- a/VersionASM
+++ b/VersionASM
@@ -1,6 +1,6 @@
;
; This file is automatically maintained by srccommit, do not edit manually.
-; Last processed by srccommit version: 1.68.
+; Last processed by srccommit version: 1.2.
;
GBLS Module_MajorVersion
GBLA Module_Version
@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
-Module_MinorVersion SETS "4.79.2.60"
-Module_Date SETS "15 Apr 2003"
-Module_ApplicationDate SETS "15-Apr-03"
+Module_MinorVersion SETS "4.79.2.61"
+Module_Date SETS "02 Dec 2003"
+Module_ApplicationDate SETS "02-Dec-03"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.60)"
-Module_HelpVersion SETS "5.35 (15 Apr 2003) 4.79.2.60"
+Module_FullVersion SETS "5.35 (4.79.2.61)"
+Module_HelpVersion SETS "5.35 (02 Dec 2003) 4.79.2.61"
END
diff --git a/VersionNum b/VersionNum
index e11c7ab..ed181b7 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
/* (5.35)
*
* This file is automatically maintained by srccommit, do not edit manually.
- * Last processed by srccommit version: 1.68.
+ * Last processed by srccommit version: 1.2.
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.60
-#define Module_Date_CMHG 15 Apr 2003
+#define Module_MinorVersion_CMHG 4.79.2.61
+#define Module_Date_CMHG 02 Dec 2003
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.60"
-#define Module_Date "15 Apr 2003"
+#define Module_MinorVersion "4.79.2.61"
+#define Module_Date "02 Dec 2003"
-#define Module_ApplicationDate "15-Apr-03"
+#define Module_ApplicationDate "02-Dec-03"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.60)"
-#define Module_HelpVersion "5.35 (15 Apr 2003) 4.79.2.60"
+#define Module_FullVersion "5.35 (4.79.2.61)"
+#define Module_HelpVersion "5.35 (02 Dec 2003) 4.79.2.61"
#define Module_LibraryVersionInfo "5:35"
diff --git a/s/PMF/key b/s/PMF/key
index d972148..bcff40f 100644
--- a/s/PMF/key
+++ b/s/PMF/key
@@ -785,6 +785,8 @@ GenerateChar ROUT
CallSpecialReturnNChars
Push R14
+ CMP R0, #-1
+ Pull PC,EQ
04
BL CallSpecialCode
--
GitLab