diff -r 2d65c2f76d7b -r 4a8fed1c0ef6 kerneltest/e32test/mmu/t_cache.cpp --- a/kerneltest/e32test/mmu/t_cache.cpp Tue Feb 02 01:24:03 2010 +0200 +++ b/kerneltest/e32test/mmu/t_cache.cpp Sat Feb 20 00:10:51 2010 +0200 @@ -310,18 +310,17 @@ DoTest4(RCacheTestDevice::E_Normal_Cached, dC, timeNS, timeS); test.Printf(_L("Normal_Cached %08xH\t%7d\t%7d\n"),dC.iActualMapAttr, timeNS, timeS); + DoTest4(RCacheTestDevice::E_KernelInternal4, dC, timeNS, timeS); + test.Printf(_L("KernelInternal4 %08xH\t%7d\t%7d\n"),dC.iActualMapAttr, timeNS, timeS); + DoTest4(RCacheTestDevice::E_PlatformSpecific5, dC, timeNS, timeS); + test.Printf(_L("PlatSpecific5 %08xH\t%7d\t%7d\n"),dC.iActualMapAttr, timeNS, timeS); + DoTest4(RCacheTestDevice::E_PlatformSpecific6, dC, timeNS, timeS); + test.Printf(_L("PlatSpecific6 %08xH\t%7d\t%7d\n"),dC.iActualMapAttr, timeNS, timeS); + DoTest4(RCacheTestDevice::E_PlatformSpecific7, dC, timeNS, timeS); + test.Printf(_L("PlatSpecific7 %08xH\t%7d\t%7d\n"),dC.iActualMapAttr, timeNS, timeS); + if(CacheInfo.iMemoryRemapping) { - DoTest4(RCacheTestDevice::E_KernelInternal4, dC, timeNS, timeS); - test.Printf(_L("KernelInternal4 %08xH\t%7d\t%7d\n"),dC.iActualMapAttr, timeNS, timeS); - DoTest4(RCacheTestDevice::E_PlatformSpecific5, dC, timeNS, timeS); - test.Printf(_L("PlatSpecific5 %08xH\t%7d\t%7d\n"),dC.iActualMapAttr, timeNS, timeS); - DoTest4(RCacheTestDevice::E_PlatformSpecific6, dC, timeNS, timeS); - test.Printf(_L("PlatSpecific6 %08xH\t%7d\t%7d\n"),dC.iActualMapAttr, timeNS, timeS); - DoTest4(RCacheTestDevice::E_PlatformSpecific7, dC, timeNS, timeS); - test.Printf(_L("PlatSpecific7 %08xH\t%7d\t%7d\n"),dC.iActualMapAttr, timeNS, timeS); - - DoTest4(RCacheTestDevice::E_InnerWT_Remapped, dC, timeNS, timeS); test.Printf(_L("InnerWT_Remap %08xH\t%7d\t%7d\n"),dC.iActualMapAttr, timeNS, timeS); DoTest4(RCacheTestDevice::E_InnerWBRA_Remapped, dC, timeNS, timeS);