From 1772867b77bef2030de97f82c1f0daa8c93003d9 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@portege.thepowersgang.com>
Date: Tue, 22 Sep 2009 20:29:36 +0800
Subject: [PATCH] Added debug to malloc, added caller to out of memory message

---
 Kernel/arch/x86/mm_phys.c | 8 ++------
 Kernel/heap.c             | 3 +++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Kernel/arch/x86/mm_phys.c b/Kernel/arch/x86/mm_phys.c
index de30a931..72f5dc9a 100644
--- a/Kernel/arch/x86/mm_phys.c
+++ b/Kernel/arch/x86/mm_phys.c
@@ -76,11 +76,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,7 +96,7 @@ tPAddr MM_AllocPhys()
 	for(a=0;gaSuperBitmap[a]==-1&&a<num;a++);
 	if(a == num) {
 		RELEASE( &giPhysAlloc );
-		Warning("MM_AllocPhys - OUT OF MEMORY\n");
+		Warning("MM_AllocPhys - OUT OF MEMORY (Called by %p)",  __builtin_return_address(0));
 		return 0;
 	}
 	for(b=0;gaSuperBitmap[a]&(1<<b);b++);
diff --git a/Kernel/heap.c b/Kernel/heap.c
index e5a37232..90b7256e 100644
--- a/Kernel/heap.c
+++ b/Kernel/heap.c
@@ -175,6 +175,7 @@ void *malloc(size_t Bytes)
 		if(head->Size == Bytes) {
 			head->Magic = MAGIC_USED;
 			RELEASE(&giHeapSpinlock);	// Release spinlock
+			LOG("RETURN %p", best->Data);
 			return best->Data;
 		}
 		
@@ -204,6 +205,7 @@ void *malloc(size_t Bytes)
 		// Check size
 		if(best->Size == Bytes) {
 			RELEASE(&giHeapSpinlock);	// Release spinlock
+			LOG("RETURN %p", best->Data);
 			return best->Data;
 		}
 	}
@@ -222,6 +224,7 @@ void *malloc(size_t Bytes)
 	best->Magic = MAGIC_USED;	// Mark block as used
 	
 	RELEASE(&giHeapSpinlock);	// Release spinlock
+	LOG("RETURN %p", best->Data);
 	return best->Data;
 }
 
-- 
2.20.1