X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fmm_virt.c;h=8c59ea0fba5d3c11cd65f7d8b646f91c822576af;hb=de86ddb7cb10ee403732f9207aba756f267ef3de;hp=72c40c2a84b7be751ab2ddbfc1b5ef98307ed586;hpb=4cbfb47ebf71128b57cf25a131550b3f66a295a3;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/mm_virt.c b/Kernel/arch/x86/mm_virt.c
index 72c40c2a..8c59ea0f 100644
--- a/Kernel/arch/x86/mm_virt.c
+++ b/Kernel/arch/x86/mm_virt.c
@@ -55,6 +55,7 @@
 #define	PF_PRESENT	0x1
 #define	PF_WRITE	0x2
 #define	PF_USER		0x4
+#define PF_GLOBAL	0x80
 #define	PF_COW		0x200
 #define	PF_NOPAGE	0x400
 
@@ -276,7 +277,7 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
 	tPAddr	expected = 0;
 	tVAddr	curPos;
 	Uint	page;
-	const tPAddr	MASK = ~0xF98;
+	const tPAddr	MASK = ~0xF78;
 	
 	Start >>= 12;	End >>= 12;
 	
@@ -306,14 +307,16 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
 		||  (gaPageTable[page] & MASK) != expected)
 		{
 			if(expected) {
-				Log(" 0x%08x-0x%08x => 0x%08x-0x%08x (%s%s%s%s)",
-					rangeStart, curPos - 1,
+				Log(" 0x%08x => 0x%08x - 0x%08x (%s%s%s%s%s)",
+					rangeStart,
 					gaPageTable[rangeStart>>12] & ~0xFFF,
-					(expected & ~0xFFF) - 1,
+					curPos - rangeStart,
 					(expected & PF_NOPAGE ? "P" : "-"),
 					(expected & PF_COW ? "C" : "-"),
+					(expected & PF_GLOBAL ? "G" : "-"),
 					(expected & PF_USER ? "U" : "-"),
-					(expected & PF_WRITE ? "W" : "-")
+					(expected & PF_WRITE ? "W" : "-"),
+					gaPageTable[page] & MASK, expected
 					);
 				expected = 0;
 			}
@@ -327,10 +330,10 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
 	}
 	
 	if(expected) {
-		Log("0x%08x-0x%08x => 0x%08x-0x%08x (%s%s%s%s)",
-			rangeStart, curPos - 1,
+		Log("0x%08x => 0x%08x - 0x%08x (%s%s%s%s)",
+			rangeStart,
 			gaPageTable[rangeStart>>12] & ~0xFFF,
-			(expected & ~0xFFF) - 1,
+			curPos - rangeStart,
 			(expected & PF_NOPAGE ? "p" : "-"),
 			(expected & PF_COW ? "C" : "-"),
 			(expected & PF_USER ? "U" : "-"),