From 851715122f59cb4fb7bf264c984bc29c1d382cf2 Mon Sep 17 00:00:00 2001
From: Robert Sprowson <rsprowson@gitlab.riscosopen.org>
Date: Sun, 19 Jul 2020 09:10:02 +0100
Subject: [PATCH] Rename clashing CLI macro
The name clashes with the recently added clear IRQ flag macro, CLI, but is only used in a debug case.
Version 5.77. Not tagged
---
VersionASM | 6 +++---
VersionNum | 8 ++++----
s/Wimp01 | 2 +-
s/Wimp07 | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/VersionASM b/VersionASM
index 08beb24..824cf1a 100644
--- a/VersionASM
+++ b/VersionASM
@@ -12,9 +12,9 @@
Module_MajorVersion SETS "5.77"
Module_Version SETA 577
Module_MinorVersion SETS ""
-Module_Date SETS "08 Jul 2020"
-Module_ApplicationDate SETS "08-Jul-20"
+Module_Date SETS "20 Jul 2020"
+Module_ApplicationDate SETS "20-Jul-20"
Module_ComponentName SETS "Wimp"
Module_FullVersion SETS "5.77"
-Module_HelpVersion SETS "5.77 (08 Jul 2020)"
+Module_HelpVersion SETS "5.77 (20 Jul 2020)"
END
diff --git a/VersionNum b/VersionNum
index a1a82b0..69433f9 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,17 +5,17 @@
*/
#define Module_MajorVersion_CMHG 5.77
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 08 Jul 2020
+#define Module_Date_CMHG 20 Jul 2020
#define Module_MajorVersion "5.77"
#define Module_Version 577
#define Module_MinorVersion ""
-#define Module_Date "08 Jul 2020"
+#define Module_Date "20 Jul 2020"
-#define Module_ApplicationDate "08-Jul-20"
+#define Module_ApplicationDate "20-Jul-20"
#define Module_ComponentName "Wimp"
#define Module_FullVersion "5.77"
-#define Module_HelpVersion "5.77 (08 Jul 2020)"
+#define Module_HelpVersion "5.77 (20 Jul 2020)"
#define Module_LibraryVersionInfo "5:77"
diff --git a/s/Wimp01 b/s/Wimp01
index 7fdb155..83a7d03 100644
--- a/s/Wimp01
+++ b/s/Wimp01
@@ -134,7 +134,7 @@ $l SUB $rd,$rs,#"0"
MEND
MACRO
-$label CLI $command
+$label InlineCLI $command
$label
Push "R0,R14"
ADR R0,%FT01
diff --git a/s/Wimp07 b/s/Wimp07
index 4081ed0..0e25c3f 100644
--- a/s/Wimp07
+++ b/s/Wimp07
@@ -1081,11 +1081,11 @@ Do_ErrorHandler
[ debugtask1
ADRL R13,stackspace
Debuga task1,"Error reported to Wimp: "
- CLI "HostVdu"
+ InlineCLI "HostVdu"
ADRL R0,errorbuffer+8 ; skip saved PC & error number
SWI XOS_Write0
SWI XOS_NewLine
- CLI "TubeVdu"
+ InlineCLI "TubeVdu"
]
ADRL R0,errorbuffer+4 ; skip saved PC
MOV R1,#erf_cancelbox:OR:erf_htcancel:OR:erf_dontwait
--
GitLab