}
// TLBIALL
- TLBIALL();
+ TLBIALL();
+
+ memset( (void*)&table1[ (VAddr >> 12) & ~(1024-1) ], 0, 0x1000 );
LEAVE('i', 0);
return 0;
if( (*desc & 3) == 1 ) LEAVE_RET('i', 1);
if( pi->PhysAddr == 0 ) {
*desc = 0;
+ TLBIMVA(VAddr & 0xFFFFF000);
LEAVE('i', 0);
return 0;
}
pi.AP = AP_KRW_ONLY; // Kernel Read/Write
pi.bExecutable = 1;
if( MM_int_SetPageInfo(VAddr, &pi) ) {
- MM_DerefPhys(pi.PhysAddr);
+// MM_DerefPhys(pi.PhysAddr);
return 0;
}
return pi.PhysAddr;
j = (sp / 0x1000) % 1024;
num = MM_KSTACK_SIZE/0x1000;
- Log("num = %i, sp = %p, j = %i", num, sp, j);
+// Log("num = %i, sp = %p, j = %i", num, sp, j);
// Copy stack pages
for(; num--; j ++, sp += 0x1000)
void *tmp_page;
page = MM_AllocPhys();
- Log("page = %P", page);
+// Log("page = %P", page);
table[j] = page | 0x813;
tmp_page = (void*)MM_MapTemp(page);
// MM_DumpTables(0, 0x80000000);
- Log("user_table_count = %i (as opposed to %i)", user_table_count, 0x800-4);
+// Log("user_table_count = %i (as opposed to %i)", user_table_count, 0x800-4);
for( i = 0; i < user_table_count; i ++ )
{
}
- MM_DumpTables(0, 0x80000000);
-// Log_KernelPanic("MMVirt", "TODO: Implement MM_ClearUser");
+// MM_DumpTables(0, 0x80000000);
}
tVAddr MM_MapTemp(tPAddr PAddr)
if( MM_int_GetPageInfo(ret, &pi) == 0 )
continue;
- Log("MapTemp %P at %p by %p", PAddr, ret, __builtin_return_address(0));
+// Log("MapTemp %P at %p by %p", PAddr, ret, __builtin_return_address(0));
MM_RefPhys(PAddr); // Counter the MM_Deallocate in FreeTemp
MM_Map(ret, PAddr);
pi_old.Size = 0;
- Debug("Page Table Dump:");
+ Debug("Page Table Dump (%p to %p):", Start, End);
range_start = Start;
for( addr = Start; i == 0 || (addr && addr < End); i = 1 )
{
Debug("Done");
}
-// NOTE: Runs in abort context, not much differe, just a smaller stack
+// NOTE: Runs in abort context, not much difference, just a smaller stack
void MM_PageFault(Uint32 PC, Uint32 Addr, Uint32 DFSR, int bPrefetch)
{
int rv;
if( rv == 0 && pi.AP == AP_RO_BOTH )
{
pi.AP = AP_RW_BOTH;
- if( MM_GetRefCount(pi.PhysAddr) > 1 )
+ if( giMM_ZeroPage && pi.PhysAddr == giMM_ZeroPage )
+ {
+ tPAddr newpage;
+ newpage = MM_AllocPhys();
+ if( !newpage ) {
+ Log_Error("MMVirt", "Unable to allocate new page for COW of ZERO");
+ for(;;);
+ }
+
+ #if TRACE_COW
+ Log_Notice("MMVirt", "COW %p caused by %p, ZERO duped to %P (RefCnt(%i)--)", Addr, PC,
+ newpage, MM_GetRefCount(pi.PhysAddr));
+ #endif
+
+ MM_DerefPhys(pi.PhysAddr);
+ pi.PhysAddr = newpage;
+ pi.AP = AP_RW_BOTH;
+ MM_int_SetPageInfo(Addr, &pi);
+
+ memset( (void*)(Addr & ~(PAGE_SIZE-1)), 0, PAGE_SIZE );
+
+ return ;
+ }
+ else if( MM_GetRefCount(pi.PhysAddr) > 1 )
{
// Duplicate the page
tPAddr newpage;
memcpy( dst, src, PAGE_SIZE );
MM_FreeTemp( (tVAddr)dst );
- Log_Notice("MMVirt", "COW %p caused by %p, %P duped to %P", Addr, PC,
- pi.PhysAddr, newpage);
+ #if TRACE_COW
+ Log_Notice("MMVirt", "COW %p caused by %p, %P duped to %P (RefCnt(%i)--)", Addr, PC,
+ pi.PhysAddr, newpage, MM_GetRefCount(pi.PhysAddr));
+ #endif
MM_DerefPhys(pi.PhysAddr);
pi.PhysAddr = newpage;
}
+ #if TRACE_COW
else {
- Log_Notice("MMVirt", "COW %p caused by %p, took last reference to %P", Addr, PC, pi.PhysAddr);
+ Log_Notice("MMVirt", "COW %p caused by %p, took last reference to %P",
+ Addr, PC, pi.PhysAddr);
}
+ #endif
// Unset COW
pi.AP = AP_RW_BOTH;
MM_int_SetPageInfo(Addr, &pi);
Log_Error("MMVirt", "Code at %p accessed %p (DFSR = 0x%x)%s", PC, Addr, DFSR,
(bPrefetch ? " - Prefetch" : "")
);
+ if( Addr < 0x80000000 )
+ MM_DumpTables(0, 0x80000000);
+ else
+ MM_DumpTables(0x80000000, -1);
for(;;);
}