From 36751c40558612204ed3067639e8ff71a25a7ad5 Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <jlee@gitlab.riscosopen.org>
Date: Sat, 24 Mar 2012 10:53:06 +0000
Subject: [PATCH] Fix asasm 2.00 error
Detail:
s/AMBControl/service - Fix missing colon on end of :OR: operator
Admin:
Identical binary under objasm
Version 5.35, 4.79.2.142. Tagged as 'Kernel-5_35-4_79_2_142'
---
VersionASM | 10 +++++-----
VersionNum | 14 +++++++-------
s/AMBControl/service | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/VersionASM b/VersionASM
index f29e338..4979868 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.141"
-Module_Date SETS "19 Mar 2012"
-Module_ApplicationDate SETS "19-Mar-12"
+Module_MinorVersion SETS "4.79.2.142"
+Module_Date SETS "24 Mar 2012"
+Module_ApplicationDate SETS "24-Mar-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.141)"
-Module_HelpVersion SETS "5.35 (19 Mar 2012) 4.79.2.141"
+Module_FullVersion SETS "5.35 (4.79.2.142)"
+Module_HelpVersion SETS "5.35 (24 Mar 2012) 4.79.2.142"
END
diff --git a/VersionNum b/VersionNum
index c092fa5..285bbcf 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.141
-#define Module_Date_CMHG 19 Mar 2012
+#define Module_MinorVersion_CMHG 4.79.2.142
+#define Module_Date_CMHG 24 Mar 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.141"
-#define Module_Date "19 Mar 2012"
+#define Module_MinorVersion "4.79.2.142"
+#define Module_Date "24 Mar 2012"
-#define Module_ApplicationDate "19-Mar-12"
+#define Module_ApplicationDate "24-Mar-12"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.141)"
-#define Module_HelpVersion "5.35 (19 Mar 2012) 4.79.2.141"
+#define Module_FullVersion "5.35 (4.79.2.142)"
+#define Module_HelpVersion "5.35 (24 Mar 2012) 4.79.2.142"
#define Module_LibraryVersionInfo "5:35"
diff --git a/s/AMBControl/service b/s/AMBControl/service
index 8209412..4671617 100644
--- a/s/AMBControl/service
+++ b/s/AMBControl/service
@@ -121,7 +121,7 @@ AMBsrv_memorymoved ROUT
STR R5,AMBNmemmoveshrink
]
LDR R5,AMBFlags
- TST R5,#AMBFlag_LazyMapIn_disable :OR AMBFlag_LazyMapIn_suspend
+ TST R5,#AMBFlag_LazyMapIn_disable :OR: AMBFlag_LazyMapIn_suspend
BNE %FT41
LDR R5,AMBMappedInNpages
SUB R5,R5,R3
--
GitLab