X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Farch%2Fx86_64%2Fmm_virt.c;h=bc9e8f6fb99b6c8ea63f65b37def0ef70b8759bc;hb=a1b7b0fcbf99e2c53dd6d7ee5961772bf29bdb2b;hp=4ec08471f1346e80a5e124ed5684e1860b8f46a0;hpb=7d7952eb5cab57587c50a9c0d8c1bc45c55c0f2c;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/mm_virt.c b/Kernel/arch/x86_64/mm_virt.c
index 4ec08471..bc9e8f6f 100644
--- a/Kernel/arch/x86_64/mm_virt.c
+++ b/Kernel/arch/x86_64/mm_virt.c
@@ -47,6 +47,7 @@ void	MM_DumpTables(tVAddr Start, tVAddr End);
 // === CODE ===
 void MM_InitVirt(void)
 {
+	MM_DumpTables(0, -1L);
 }
 
 void MM_FinishVirtualInit(void)
@@ -137,11 +138,12 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
 	tVAddr	curPos;
 	Uint	page;
 	
+	Log("Table Entries: (%p to %p)", Start, End);
+	
 	End &= (1L << 48) - 1;
 	
 	Start >>= 12;	End >>= 12;
 	
-	Log("Table Entries:");
 	for(page = Start, curPos = Start<<12;
 		page < End;
 		curPos += 0x1000, page++)
@@ -149,6 +151,11 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
 		if( curPos == 0x800000000000L )
 			curPos = 0xFFFF800000000000L;
 		
+		//Debug("&PAGEMAPLVL4(%i page>>27) = %p", page>>27, &PAGEMAPLVL4(page>>27));
+		//Debug("&PAGEDIRPTR(%i page>>18) = %p", page>>18, &PAGEDIRPTR(page>>18));
+		//Debug("&PAGEDIR(%i page>>9) = %p", page>>9, &PAGEDIR(page>>9));
+		//Debug("&PAGETABLE(%i page) = %p", page, &PAGETABLE(page));
+		
 		// End of a range
 		if(
 			!(PAGEMAPLVL4(page>>27) & PF_PRESENT)
@@ -172,16 +179,19 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
 			if( !(PAGEMAPLVL4(page>>27) & PF_PRESENT) ) {
 				page += (1 << 27) - 1;
 				curPos += (1L << 39) - 0x1000;
+				//Debug("pml4 ent unset (page = 0x%x now)", page);
 				continue;
 			}
 			if( !(PAGEDIRPTR(page>>18) & PF_PRESENT) ) {
 				page += (1 << 18) - 1;
 				curPos += (1L << 30) - 0x1000;
+				//Debug("pdp ent unset (page = 0x%x now)", page);
 				continue;
 			}
 			if( !(PAGEDIR(page>>9) & PF_PRESENT) ) {
 				page += (1 << 9) - 1;
 				curPos += (1L << 21) - 0x1000;
+				//Debug("pd ent unset (page = 0x%x now)", page);
 				continue;
 			}
 			if( !(PAGETABLE(page) & PF_PRESENT) )	continue;
@@ -335,19 +345,14 @@ void MM_Deallocate(tVAddr VAddr)
  */
 tPAddr MM_GetPhysAddr(tVAddr Addr)
 {
-	Log("MM_GetPhysAddr: (Addr=0x%x)", Addr);
 	if( !(PAGEMAPLVL4(Addr >> 39) & 1) )
 		return 0;
-	Log(" MM_GetPhysAddr: PDP Valid");
 	if( !(PAGEDIRPTR(Addr >> 30) & 1) )
 		return 0;
-	Log(" MM_GetPhysAddr: PD Valid");
 	if( !(PAGEDIR(Addr >> 21) & 1) )
 		return 0;
-	Log(" MM_GetPhysAddr: PT Valid");
 	if( !(PAGETABLE(Addr >> PTAB_SHIFT) & 1) )
 		return 0;
-	Log(" MM_GetPhysAddr: Page Valid");
 	
 	return (PAGETABLE(Addr >> PTAB_SHIFT) & ~0xFFF) | (Addr & 0xFFF);
 }