X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fmm_phys.c;h=acca5f5c3afdb183ed4ca8bfb34c3917298317b3;hb=8fbb4dea9912d22c1758d38b843e406a263fdd42;hp=e81c99e657f2b4909b83f87539721cba2d574b3e;hpb=f7f1b08ec035ddef61218b51d8e9a9d4c1ee7b9a;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/mm_phys.c b/Kernel/arch/x86/mm_phys.c
index e81c99e6..acca5f5c 100644
--- a/Kernel/arch/x86/mm_phys.c
+++ b/Kernel/arch/x86/mm_phys.c
@@ -2,6 +2,7 @@
  AcessOS Microkernel Version
  mm_phys.c
 */
+#define DEBUG	1
 #include <common.h>
 #include <mboot.h>
 #include <mm_virt.h>
@@ -32,7 +33,7 @@ void MM_Install(tMBoot_Info *MBoot)
 	
 	// Initialise globals
 	giPageCount = (MBoot->HighMem >> 2) + 256;	// HighMem is a kByte value
-	Log("giPageCount = %i", giPageCount);
+	LOG("giPageCount = %i", giPageCount);
 	
 	// Get used page count
 	kernelPages = (Uint)&gKernelEnd - KERNEL_BASE;
@@ -65,7 +66,7 @@ void MM_Install(tMBoot_Info *MBoot)
 	}
 	
 	// Allocate References
-	Log("Reference Pages %i", (giPageCount*4+0xFFF)>>12);
+	LOG("Reference Pages %i", (giPageCount*4+0xFFF)>>12);
 	for(num = 0; num < (giPageCount*4+0xFFF)>>12; num++)
 	{
 		MM_Allocate( REFERENCE_BASE + (num<<12) );
@@ -76,11 +77,7 @@ void MM_Install(tMBoot_Info *MBoot)
 	memsetd(gaPageReferences, 1, kernelPages);
 	for( num = kernelPages; num < giPageCount; num++ )
 	{
-		//if(gaPageBitmap[ num2 / 32 ] == 0) {
-		//	memsetd(&gaPageReferences[num2], 0, 31-(num2&31));
-		//	num2 = (num2 + 32) & ~31;
-		//} else
-			gaPageReferences[num] = (gaPageBitmap[ num / 32 ] >> (num&31)) & 1;
+		gaPageReferences[num] = (gaPageBitmap[ num / 32 ] >> (num&31)) & 1;
 	}
 }
 
@@ -100,6 +97,7 @@ tPAddr MM_AllocPhys()
 	for(a=0;gaSuperBitmap[a]==-1&&a<num;a++);
 	if(a == num) {
 		RELEASE( &giPhysAlloc );
+		Warning("MM_AllocPhys - OUT OF MEMORY (Called by %p)", __builtin_return_address(0));
 		return 0;
 	}
 	for(b=0;gaSuperBitmap[a]&(1<<b);b++);
@@ -119,6 +117,7 @@ tPAddr MM_AllocPhys()
 
 	// Release Spinlock
 	RELEASE( &giPhysAlloc );
+	LOG("Allocated 0x%x\n", ret);
 	//LOG("ret = %x", ret);
 	return ret;
 }
@@ -177,6 +176,7 @@ void MM_DerefPhys(tPAddr Addr)
 	// Mark as free in bitmaps
 	if( gaPageReferences[ Addr ] == 0 )
 	{
+		LOG("Freed 0x%x by %p\n", Addr<<12, __builtin_return_address(0));
 		gaPageBitmap[ Addr / 32 ] &= ~(1 << (Addr&31));
 		if(gaPageReferences[ Addr ] == 0)
 			gaSuperBitmap[ Addr >> 10 ] &= ~(1 << ((Addr >> 5)&31));