Commit 85171512 authored by Robert Sprowson's avatar Robert Sprowson Committed by ROOL

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
parent 2acd405d
......@@ -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
......@@ -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"
......@@ -134,7 +134,7 @@ $l SUB $rd,$rs,#"0"
MEND
MACRO
$label CLI $command
$label InlineCLI $command
$label
Push "R0,R14"
ADR R0,%FT01
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment