diff --git a/VersionASM b/VersionASM index 0c92ca96c70f5c2a018bfc90399edaa9d5d32360..ea91a12e77d6cb6ac46aa516bb119abe0d92340e 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.280" -Module_Date SETS "15 Aug 2015" -Module_ApplicationDate SETS "15-Aug-15" +Module_MinorVersion SETS "4.79.2.281" +Module_Date SETS "18 Aug 2015" +Module_ApplicationDate SETS "18-Aug-15" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "5.35 (4.79.2.280)" -Module_HelpVersion SETS "5.35 (15 Aug 2015) 4.79.2.280" +Module_FullVersion SETS "5.35 (4.79.2.281)" +Module_HelpVersion SETS "5.35 (18 Aug 2015) 4.79.2.281" END diff --git a/VersionNum b/VersionNum index daabf0d0c511839dfa08e633da7e497ac89aaaae..382e559aa25e64620ca638794a2dce0ec5871618 100644 --- a/VersionNum +++ b/VersionNum @@ -5,19 +5,19 @@ * */ #define Module_MajorVersion_CMHG 5.35 -#define Module_MinorVersion_CMHG 4.79.2.280 -#define Module_Date_CMHG 15 Aug 2015 +#define Module_MinorVersion_CMHG 4.79.2.281 +#define Module_Date_CMHG 18 Aug 2015 #define Module_MajorVersion "5.35" #define Module_Version 535 -#define Module_MinorVersion "4.79.2.280" -#define Module_Date "15 Aug 2015" +#define Module_MinorVersion "4.79.2.281" +#define Module_Date "18 Aug 2015" -#define Module_ApplicationDate "15-Aug-15" +#define Module_ApplicationDate "18-Aug-15" #define Module_ComponentName "Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel" -#define Module_FullVersion "5.35 (4.79.2.280)" -#define Module_HelpVersion "5.35 (15 Aug 2015) 4.79.2.280" +#define Module_FullVersion "5.35 (4.79.2.281)" +#define Module_HelpVersion "5.35 (18 Aug 2015) 4.79.2.281" #define Module_LibraryVersionInfo "5:35" diff --git a/s/ARMops b/s/ARMops index 420bd8f14a1387eda0787eadab406c4568c03e06..39aacc0763674bac1a9dd2a84181b2632e0396f1 100644 --- a/s/ARMops +++ b/s/ARMops @@ -642,7 +642,7 @@ Analyse_WB_CR7_Lx TST a1, #7 ADD a3, a3, #1 MOVNE a1, a1, LSR #3 - CMP a3, #Cache_Lx_MaxLevel ; Stop at the last level we support + CMP a3, #Cache_Lx_MaxLevel*2 ; Stop at the last level we support ADD a2, a2, #4 BLT %BT10