diff --git a/VersionASM b/VersionASM index d5e8c235e40d2fed118971b0fda85d9cc032dc1d..4b434a6b69e260e64c7aa0d4e229f55d0bcaf80b 100644 --- a/VersionASM +++ b/VersionASM @@ -13,11 +13,11 @@ GBLS Module_ComponentPath Module_MajorVersion SETS "5.35" Module_Version SETA 535 -Module_MinorVersion SETS "4.79.2.134" -Module_Date SETS "27 Jan 2012" -Module_ApplicationDate SETS "27-Jan-12" +Module_MinorVersion SETS "4.79.2.135" +Module_Date SETS "31 Jan 2012" +Module_ApplicationDate SETS "31-Jan-12" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "5.35 (4.79.2.134)" -Module_HelpVersion SETS "5.35 (27 Jan 2012) 4.79.2.134" +Module_FullVersion SETS "5.35 (4.79.2.135)" +Module_HelpVersion SETS "5.35 (31 Jan 2012) 4.79.2.135" END diff --git a/VersionNum b/VersionNum index ec3bdf26ea3e2c494c59193002e4d093dbced457..ab41b5c2ba222d38436d1732c50f9305f90f2d1b 100644 --- a/VersionNum +++ b/VersionNum @@ -5,19 +5,19 @@ * */ #define Module_MajorVersion_CMHG 5.35 -#define Module_MinorVersion_CMHG 4.79.2.134 -#define Module_Date_CMHG 27 Jan 2012 +#define Module_MinorVersion_CMHG 4.79.2.135 +#define Module_Date_CMHG 31 Jan 2012 #define Module_MajorVersion "5.35" #define Module_Version 535 -#define Module_MinorVersion "4.79.2.134" -#define Module_Date "27 Jan 2012" +#define Module_MinorVersion "4.79.2.135" +#define Module_Date "31 Jan 2012" -#define Module_ApplicationDate "27-Jan-12" +#define Module_ApplicationDate "31-Jan-12" #define Module_ComponentName "Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel" -#define Module_FullVersion "5.35 (4.79.2.134)" -#define Module_HelpVersion "5.35 (27 Jan 2012) 4.79.2.134" +#define Module_FullVersion "5.35 (4.79.2.135)" +#define Module_HelpVersion "5.35 (31 Jan 2012) 4.79.2.135" #define Module_LibraryVersionInfo "5:35" diff --git a/s/Oscli b/s/Oscli index 2f6473c29ae1e0cc84ebd69e9ef4eb17e0260d11..38d6d97d857636d9c2e5d66123710fa160947fba 100644 --- a/s/Oscli +++ b/s/Oscli @@ -815,12 +815,13 @@ schl_nofudgesofar CMP R4, #4 BLS schl_fudgeloop schl_nofudge - AND R4, R1,#Oscli_CHashValMask ;hash value, masked for command hashing - ADRL R1, SysCommsModule ADRL R2, SysCoHashedCmdTab + AND R4, R1,#Oscli_CHashValMask ;hash value, masked for command hashing LDR R2, [R2, R4, LSL #2] ;command list for this hash value - SEC ;carry set means sys module - B ModCommsLookUp_AltEntry + ADRL R1, SysCommsModule + CMP R2, #1 ;set carry if valid table entry + BCS ModCommsLookUp_AltEntry ;note: carry set to indicate sys module + Pull "R0, R2-R10, pc" ;bail if null hash table entry (with carry clear to indicate failure) schl_fudge ADRL R1, SysCommsModule ADRL R2, SHC_fudgeulike @@ -835,12 +836,13 @@ schl_fudge UtilCommsHashedLookup ROUT Push "R0, R2-R10, lr" - AND R4, R1,#Oscli_CHashValMask ;hash value, masked for command hashing - ADRL R1, UtilityMod ADRL R2, UtilHashedCmdTab + AND R4, R1,#Oscli_CHashValMask ;hash value, masked for command hashing LDR R2, [R2, R4, LSL #2] ;command list for this hash value - CLC - B ModCommsLookUp_AltEntry + ADRL R1, UtilityMod + TEQ R2, #0,2 ;check R2 and clear carry + BNE ModCommsLookUp_AltEntry + Pull "R0, R2-R10, pc" ;bail if null hash table entry ; ] ;Oscli_HashedCommands