#include <mm_virt.h>
#include <hal_proc.h>
+#define TRACE_MAPS 0
+
#define AP_KRW_ONLY 1 // Kernel page
#define AP_KRO_ONLY 5 // Kernel RO page
#define AP_RW_BOTH 3 // Standard RW
int MM_Map(tVAddr VAddr, tPAddr PAddr)
{
tMM_PageInfo pi = {0};
-// Log("MM_Map %P=>%p", PAddr, VAddr);
+ #if TRACE_MAPS
+ Log("MM_Map %P=>%p", PAddr, VAddr);
+ #endif
pi.PhysAddr = PAddr;
pi.Size = 12;
{
tPAddr table;
Uint32 *tmp_map;
- Uint32 *cur = (void*)MM_TABLE0USER;
+ Uint32 *cur = (void*)MM_TABLE1USER;
// Uint32 *cur = &FRACTAL(MM_TABLE1USER,0);
int i;
for( i = 0; i < 1024; i ++ )
{
- switch(cur[i] & 3)
+// Log_Debug("MMVirt", "cur[%i] (%p) = %x", Table*256+i, &cur[Table*256+i], cur[Table*256+i]);
+ switch(cur[Table*256+i] & 3)
{
case 0: tmp_map[i] = 0; break;
case 1:
tmp_map[i] = 0;
- Log_Error("MMVirt", "TODO: Support large pages in MM_int_CloneTable");
+ Log_Error("MMVirt", "TODO: Support large pages in MM_int_CloneTable (%p)", (Table*256+i)*0x1000);
// Large page?
break;
case 2:
Uint32 *new_lvl1_1, *new_lvl1_2, *cur;
Uint32 *tmp_map;
int i;
+
+// MM_DumpTables(0, KERNEL_BASE);
ret = MM_AllocateRootTable();
tmp_map = new_lvl1_1;
for( i = 0; i < 0x800-4; i ++ )
{
-// Log("i = %i", i);
+ // HACK! Ignore the original identity mapping
+ if( i == 0 && Threads_GetTID() == 0 ) {
+ tmp_map[0] = 0;
+ continue;
+ }
if( i == 0x400 )
tmp_map = &new_lvl1_2[-0x400];
switch( cur[i] & 3 )
sp = __SP & ~(MM_KSTACK_SIZE-1);
j = (sp / 0x1000) % 1024;
num = MM_KSTACK_SIZE/0x1000;
+
+ Log("num = %i, sp = %p, j = %i", num, sp, j);
// Copy stack pages
for(; num--; j ++, sp += 0x1000)
if( MM_int_GetPageInfo(ret, &pi) == 0 )
continue;
-// Log("MapTemp %P at %p", PAddr, ret);
+ 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);
// Map the pages
for( i = 0; i < NPages; i ++ )
- MM_Map(ret+i*PAGE_SIZE, PAddr+i*PAddr);
+ MM_Map(ret+i*PAGE_SIZE, PAddr+i*PAGE_SIZE);
// and return
LEAVE('p', ret);
return ret;
tVAddr ret;
phys = MM_AllocPhysRange(Pages, MaxBits);
- if(!phys) return 0;
+ if(!phys) {
+ Log_Warning("MMVirt", "No space left for a %i page block (MM_AllocDMA)", Pages);
+ return 0;
+ }
ret = MM_MapHWPages(phys, Pages);
*PAddr = phys;
{
if( giMM_ZeroPage && Info->PhysAddr == giMM_ZeroPage )
{
- Log("%p => %8s - 0x%7x %i %x",
+ Debug("%p => %8s - 0x%7x %i %x",
Start, "ZERO", Len,
Info->Domain, Info->AP
);
}
else
{
- Log("%p => %8x - 0x%7x %i %x",
+ Debug("%p => %8x - 0x%7x %i %x",
Start, Info->PhysAddr-Len, Len,
Info->Domain, Info->AP
);
pi_old.Size = 0;
- Log("Page Table Dump:");
+ Debug("Page Table Dump:");
range_start = Start;
for( addr = Start; i == 0 || (addr && addr < End); i = 1 )
{
+ int rv;
// Log("addr = %p", addr);
- int rv = MM_int_GetPageInfo(addr, &pi);
+ rv = MM_int_GetPageInfo(addr, &pi);
if( rv
|| pi.Size != pi_old.Size
|| pi.Domain != pi_old.Domain
}
if(inRange)
MM_int_DumpTableEnt(range_start, addr - range_start, &pi);
- Log("Done");
+ Debug("Done");
}