Commit 39d52ee5 authored by Steve Revill's avatar Steve Revill
Browse files

X has been extended to set X$Error (if unset) to any error string.

Detail:
  If the command being executed by X returns an error, it is placed
  into the system variable X$Error, unless the variable is already
  set to a non-empty string.
Admin:
  Tested on STB3, STB-400 Issue A and RiscPC.

Version 5.31. Tagged as 'Internet-5_31'
parent cd8ad8f7
...@@ -14,14 +14,40 @@ ...@@ -14,14 +14,40 @@
; ;
AREA |ObjAsm$$Code|,CODE,READONLY AREA |ObjAsm$$Code|,CODE,READONLY
XOS_CLI * &20005 XOS_CLI * &20005
XOS_ReadVarVal * &20023
XOS_SetVarVal * &20024
ENTRY ENTRY
X X
MOV R0,R1 MOV R0, R1
SWI XOS_CLI SWI XOS_CLI
MOVS PC,LR MOVVC PC, R14
ADD R11, R0, #4
= "X 1.00 (18 May 1996) © Acorn Computers Ltd 1996" ADR R0, XError
MOV R1, R12
MVN R2, #0
MOV R3, #0
MOV R4, #0
SWI XOS_ReadVarVal
TEQ R2, #0
CMNNE R2, #1
MOVNE PC, R14
MOV R0, R11
MOV R1, R0
XLoop
LDRB R2, [R0], #1
TEQ R2, #0
BNE XLoop
SUB R2, R0, R1
ADR R0, XError
MOV R3, #0
MOV R4, #0
SWI XOS_SetVarVal
MOV PC, R14
XError
= "X$Error", 0
XVersionInfo
= "X 1.01 (09 Mar 2000) Pace Micro Technology plc, 2000", 0
END END
/* (5.30) /* (5.31)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* *
*/ */
#define Module_MajorVersion_CMHG 5.30 #define Module_MajorVersion_CMHG 5.31
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 07 Feb 2000 #define Module_Date_CMHG 09 Mar 2000
#define Module_MajorVersion "5.30" #define Module_MajorVersion "5.31"
#define Module_Version 530 #define Module_Version 531
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "07 Feb 2000" #define Module_Date "09 Mar 2000"
#define Module_FullVersion "5.30" #define Module_FullVersion "5.31"
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