--- a/kernel/eka/memmodel/epoc/flexible/mmu/mcodepaging.cpp Tue Apr 27 18:02:57 2010 +0300
+++ b/kernel/eka/memmodel/epoc/flexible/mmu/mcodepaging.cpp Tue May 11 17:28:22 2010 +0300
@@ -239,7 +239,8 @@
{
TRACE2(("DCodePagedMemoryManager::ReadPage(0x%08x,0x%08x,0x%08x,?,?)",aMemory,aIndex,aCount));
- __NK_ASSERT_DEBUG(aRequest->CheckUse(aMemory,aIndex,aCount));
+ __NK_ASSERT_DEBUG(aRequest->CheckUseContiguous(aMemory,aIndex,aCount));
+ __ASSERT_CRITICAL;
START_PAGING_BENCHMARK;
@@ -256,6 +257,7 @@
TLinAddr linAddr = aRequest->MapPages(aIndex,aCount,aPages);
TInt r = KErrNone;
+ TThreadMessage message;
if(!info.iCodeSize)
{
@@ -292,7 +294,7 @@
device.iReadUnitShift,
ReadFunc,
(TAny*)info.iCodeLocalDrive,
- (TAny*)&aRequest->iMessage);
+ (TAny*)&message);
if(bufferStart<0)
{
@@ -332,7 +334,7 @@
pagedCodeInfo->AsyncClose();
- END_PAGING_BENCHMARK(EPagingBmReadCodePage);
+ END_PAGING_BENCHMARK_N(EPagingBmReadCodePage, aCount);
return r;
}