diff --git a/VersionASM b/VersionASM index c75f12c8da803133a55b40e7a230ccc13a0522c2..7bdd6ad29ddd98feefa6195ae3c816dcf2708678 100644 --- a/VersionASM +++ b/VersionASM @@ -9,12 +9,12 @@ GBLS Module_ApplicationDate GBLS Module_HelpVersion GBLS Module_ComponentName -Module_MajorVersion SETS "6.59" -Module_Version SETA 659 +Module_MajorVersion SETS "6.60" +Module_Version SETA 660 Module_MinorVersion SETS "" Module_Date SETS "01 Jun 2022" Module_ApplicationDate SETS "01-Jun-22" Module_ComponentName SETS "Kernel" -Module_FullVersion SETS "6.59" -Module_HelpVersion SETS "6.59 (01 Jun 2022)" +Module_FullVersion SETS "6.60" +Module_HelpVersion SETS "6.60 (01 Jun 2022)" END diff --git a/VersionNum b/VersionNum index 938bb67fb313639a603e022da3059f30dccc524a..69ef35dce63e73d3cf6b996d4ed2134ed96f78fc 100644 --- a/VersionNum +++ b/VersionNum @@ -1,14 +1,14 @@ -/* (6.59) +/* (6.60) * * This file is automatically maintained by srccommit, do not edit manually. * */ -#define Module_MajorVersion_CMHG 6.59 +#define Module_MajorVersion_CMHG 6.60 #define Module_MinorVersion_CMHG #define Module_Date_CMHG 01 Jun 2022 -#define Module_MajorVersion "6.59" -#define Module_Version 659 +#define Module_MajorVersion "6.60" +#define Module_Version 660 #define Module_MinorVersion "" #define Module_Date "01 Jun 2022" @@ -16,6 +16,6 @@ #define Module_ComponentName "Kernel" -#define Module_FullVersion "6.59" -#define Module_HelpVersion "6.59 (01 Jun 2022)" -#define Module_LibraryVersionInfo "6:59" +#define Module_FullVersion "6.60" +#define Module_HelpVersion "6.60 (01 Jun 2022)" +#define Module_LibraryVersionInfo "6:60" diff --git a/s/Arthur2 b/s/Arthur2 index 947a5eee330326cb0c2b4dd55f38d67433d4d125..4ff238b32e36d83757d74ad3d1753f2914bd971d 100644 --- a/s/Arthur2 +++ b/s/Arthur2 @@ -1653,8 +1653,7 @@ SetVarVal_DeleteIt BL VarFindIt ; Error if not found - ADREQL r0, ErrorBlock_VarCantFind ; V set no. 1) - BEQ SetVarValBadExit_Translate + BEQ SVVNotFound ; Check if found vartype code that the supplied vartype was code too LDRB lr, [r4] TEQ lr, #VarType_Code @@ -1702,6 +1701,17 @@ SetVarVal_TestVExit PullEnv B SLVK_TestV +SVVNotFound + [ International + MOV r4, r0 + ADRL r0, ErrorBlock_VarCantFind + BL TranslateError_UseR4 + | + ADRL r0, ErrorBlock_VarCantFind + SETV + ] + B SetVarVal_TestVExit + SetVarValBadExit_Translate [ International BL TranslateError