diff --git a/VersionASM b/VersionASM index bee0d802c2c8f734c23f8b3a8a3c8acac7323950..3db775c4c4b84390190ad73fd67295b1e0aa8189 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.98.2.51" -Module_Date SETS "12 Sep 2011" -Module_ApplicationDate SETS "12-Sep-11" +Module_MinorVersion SETS "4.79.2.98.2.52" +Module_Date SETS "15 Sep 2011" +Module_ApplicationDate SETS "15-Sep-11" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "5.35 (4.79.2.98.2.51)" -Module_HelpVersion SETS "5.35 (12 Sep 2011) 4.79.2.98.2.51" +Module_FullVersion SETS "5.35 (4.79.2.98.2.52)" +Module_HelpVersion SETS "5.35 (15 Sep 2011) 4.79.2.98.2.52" END diff --git a/VersionNum b/VersionNum index bd8426ed19125740aeb6cf11976d8f32dd935e46..ae7167e2c34d428dea78ee31e9412ee7de125c0d 100644 --- a/VersionNum +++ b/VersionNum @@ -5,19 +5,19 @@ * */ #define Module_MajorVersion_CMHG 5.35 -#define Module_MinorVersion_CMHG 4.79.2.98.2.51 -#define Module_Date_CMHG 12 Sep 2011 +#define Module_MinorVersion_CMHG 4.79.2.98.2.52 +#define Module_Date_CMHG 15 Sep 2011 #define Module_MajorVersion "5.35" #define Module_Version 535 -#define Module_MinorVersion "4.79.2.98.2.51" -#define Module_Date "12 Sep 2011" +#define Module_MinorVersion "4.79.2.98.2.52" +#define Module_Date "15 Sep 2011" -#define Module_ApplicationDate "12-Sep-11" +#define Module_ApplicationDate "15-Sep-11" #define Module_ComponentName "Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel" -#define Module_FullVersion "5.35 (4.79.2.98.2.51)" -#define Module_HelpVersion "5.35 (12 Sep 2011) 4.79.2.98.2.51" +#define Module_FullVersion "5.35 (4.79.2.98.2.52)" +#define Module_HelpVersion "5.35 (15 Sep 2011) 4.79.2.98.2.52" #define Module_LibraryVersionInfo "5:35" diff --git a/s/ARMops b/s/ARMops index 426a5de0788400eb964d9d9364e2624b9fc0733d..0665d386a307fc84400dd3eb9af56bbc079d4938 100644 --- a/s/ARMops +++ b/s/ARMops @@ -724,7 +724,7 @@ $var SETA $var+(CT_M_$sz:SHL:CT_M_pos) ; CPUDesc table for ARMv3-ARMv6 KnownCPUTable -; /------Cache Type register fields-----\ +; /------Cache Type register fields-----\. ; ID reg Mask Arch Type S Dsz Das Dln Isz Ias Iln CPUDesc ARM600, &000600, &00FFF0, ARMv3, WT, 0, 4K, 64, 4 CPUDesc ARM610, &000610, &00FFF0, ARMv3, WT, 0, 4K, 64, 4 @@ -2001,7 +2001,7 @@ Cache_InvalidateAll_WB_CR7_Lx ROUT ; no clean, assume caller knows what's happening ; Push "r1-r8,lr" - MaintainDataCache_WB_CR7_Lx cleaninvalidate, loc + MaintainDataCache_WB_CR7_Lx invalidate, loc MCR p15, 0, a1, c7, c5, 0 ; invalidate ICache MCR p15, 0, a1, c7, c5, 6 ; invalidate branch predictors myDSB ,a1,,y ; Wait for cache/branch invalidation to complete