Commit b9c19bd2 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Fix *SAVE syntax error message.

The text had cunning hardspaces in it so that the *HELP text lines up nicely using OS_PrettyPrint, but not taking into account that internationalised syntax errors don't use OS_PrettyPrint so output VDU31,31,31 and jumped all over the place.
Syntax message rephrased to fit on one line.
Syntax and help for *TV cleared up since the help text contained all the syntax information.
Spotted 2 wasted instructions in Oscli.s while investigating, added some comments too.

Version 5.35, 4.79.2.137. Tagged as 'Kernel-5_35-4_79_2_137'
parent 07f59bea
......@@ -372,11 +372,7 @@ Save_Help
= " Length and addresses are in hexadecimal.",13
Save_Syntax
= "Syntax: *",TokenEscapeChar,Token0
= " <filename> <start addr>"
= " <end addr> [<exec addr> [<load addr>]]",13
= 31, 31, 31, 31, " or *",TokenEscapeChar,Token0
= " <filename> <start addr>"
= " + <length> [<exec addr> [<load addr>]]", 0
= " <filename> <start addr> <+length|end addr> [<exec addr> [<load addr>]]",0
Shadow_Help
= "*",TokenEscapeChar,Token0
......@@ -407,12 +403,11 @@ SpoolOn_Syntax
TV_Help
= "*",TokenEscapeChar,Token0
= " [<vertical position> [[,] <interlace>]]"
= " sets the position of the display on the screen.", 0
= " controls interlacing and sets the position of the display on the screen.", 0
TV_Syntax
= "*",TokenEscapeChar,Token0
= " needs 0 to 2 parameters.", 0
= " [<vertical position> [[,] <interlace>]]", 0
Type_Help
= "*",TokenEscapeChar,Token0
......
No preview for this file type
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.136"
Module_Date SETS "18 Feb 2012"
Module_ApplicationDate SETS "18-Feb-12"
Module_MinorVersion SETS "4.79.2.137"
Module_Date SETS "25 Feb 2012"
Module_ApplicationDate SETS "25-Feb-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.136)"
Module_HelpVersion SETS "5.35 (18 Feb 2012) 4.79.2.136"
Module_FullVersion SETS "5.35 (4.79.2.137)"
Module_HelpVersion SETS "5.35 (25 Feb 2012) 4.79.2.137"
END
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.136
#define Module_Date_CMHG 18 Feb 2012
#define Module_MinorVersion_CMHG 4.79.2.137
#define Module_Date_CMHG 25 Feb 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.136"
#define Module_Date "18 Feb 2012"
#define Module_MinorVersion "4.79.2.137"
#define Module_Date "25 Feb 2012"
#define Module_ApplicationDate "18-Feb-12"
#define Module_ApplicationDate "25-Feb-12"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.136)"
#define Module_HelpVersion "5.35 (18 Feb 2012) 4.79.2.136"
#define Module_FullVersion "5.35 (4.79.2.137)"
#define Module_HelpVersion "5.35 (25 Feb 2012) 4.79.2.137"
#define Module_LibraryVersionInfo "5:35"
......@@ -148,14 +148,15 @@ OscliStackFull
ADR R0, ErrorBlock_StackFull
[ International
BL TranslateError
|
SETV ; In place of TranslateError
]
[ No26bitCode
SETV
[ No26bitCode
Pull "pc"
|
|
Pull "lr"
ORRS PC, lr, #V_bit
]
]
;******************************************************************************
; Main OSCLI code
......@@ -1088,7 +1089,7 @@ next_parameter
SWI XMessageTrans_OpenFile
MOVVS r0, #0
33 MOV r1, r7
MOV r7, r0
MOV r7, r0 ; Message file data block
MOV r2, #0
SWI XMessageTrans_Lookup
ADDVS r2, r0, #4
......@@ -1099,7 +1100,7 @@ next_parameter
LDR r2, [sp, #16]
ADD r1, r5, #4
BL expandsyntaxmessage
MOVS r0, r7
MOVS r0, r7 ; Close iff message file was used
SWINE XMessageTrans_CloseFile
ADD sp, sp, #16
Pull r2
......@@ -1118,7 +1119,7 @@ unpleasantness_in_ModCommsLookUp
13
DCB "NumParm", 0
ALIGN
ALIGN
expandsyntaxmessage
LDRB R3, [R0], #1
......@@ -1132,13 +1133,13 @@ expandsyntaxmessage
esm_tok LDRB r3, [r0], #1
Push "r0, lr"
CMP r3, #0
CMP r3, #Token0 ; Token0 => use R2
MOVEQ r0, r2
BEQ esm001
MOV r0, r4
esmlp SUBS r3, r3, #1
LDRNEB r14, [r0] ; ECN: Use R14 instead of R4 as using R4 corrupts
ADDNE r0, r0, r14 ; the dictionary pointer thus disallowing recusive tokens
ADDNE r0, r0, r14 ; the dictionary pointer thus disallowing recursive tokens
BNE esmlp
ADD r0, r0, #1
esm001 BL expandsyntaxmessage
......@@ -1408,11 +1409,7 @@ ChangeRedirection ROUT
; do input handle
CMP R0, #&100 ; if out of range then just read
BCS %FT20
STRB R0, [R12, #RedirectInHandle]
20
STRCCB R0, [R12, #RedirectInHandle]
; do output handle
......
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