X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fheap.c;h=e53f5b85940451c9ac41f5a3fedd29b1e0acea87;hb=504e0f27f9240f083cefdc9f8dd7fefe0af544cc;hp=a9e9931fe4ede32462c4732013b923b7e7c0b4be;hpb=0f8226381e0a19e8e8e11eafbf4589532e45d430;p=tpg%2Facess2.git

diff --git a/Kernel/heap.c b/Kernel/heap.c
index a9e9931f..e53f5b85 100644
--- a/Kernel/heap.c
+++ b/Kernel/heap.c
@@ -197,7 +197,8 @@ void *Heap_Allocate(const char *File, int Line, size_t __Bytes)
 		if(head->Magic != MAGIC_FREE)	{
 			Mutex_Release(&glHeap);	// Release spinlock
 			#if WARNINGS
-			Log_Warning("Heap", "Magic of heap address %p is invalid (0x%x)", head, head->Magic);
+			Log_Warning("Heap", "Magic of heap address %p is invalid (%p = 0x%x)",
+				head, &head->Magic, head->Magic);
 			Heap_Dump();
 			#endif
 			return NULL;
@@ -309,8 +310,8 @@ void Heap_Deallocate(void *Ptr)
 	// Sanity check
 	if((Uint)Ptr < (Uint)gHeapStart || (Uint)Ptr > (Uint)gHeapEnd)
 	{
-		Log_Warning("Heap", "free - Passed a non-heap address (%p < %p < %p)\n",
-			gHeapStart, Ptr, gHeapEnd);
+		Log_Warning("Heap", "free - Passed a non-heap address by %p (%p < %p < %p)\n",
+			__builtin_return_address(0), gHeapStart, Ptr, gHeapEnd);
 		return;
 	}
 	
@@ -519,8 +520,8 @@ void Heap_Dump(void)
 	{		
 		foot = (void*)( (Uint)head + head->Size - sizeof(tHeapFoot) );
 		#if VERBOSE_DUMP
-		Log_Log("Heap", "%p (0x%llx): 0x%08lx (%i) %4C",
-			head, MM_GetPhysAddr((Uint)head), head->Size, head->ValidSize, &head->Magic);
+		Log_Log("Heap", "%p (0x%P): 0x%08x (%i) %4C",
+			head, MM_GetPhysAddr((tVAddr)head), head->Size, head->ValidSize, &head->Magic);
 		Log_Log("Heap", "%p %4C", foot->Head, &foot->Magic);
 		if(head->File) {
 			Log_Log("Heap", "%sowned by %s:%i",
@@ -571,7 +572,8 @@ void Heap_Dump(void)
 	#if !VERBOSE_DUMP
 	Log_Log("Heap", "%p (%P): 0x%08lx %i %4C",
 		head, MM_GetPhysAddr((Uint)head), head->Size, head->ValidSize, &head->Magic);
-	Log_Log("Heap", "%p %4C", foot->Head, &foot->Magic);
+	if(foot)
+		Log_Log("Heap", "Foot %p = {Head:%p,Magic:%4C}", foot, foot->Head, &foot->Magic);
 	if(head->File) {
 		Log_Log("Heap", "%sowned by %s:%i",
 			(head->Magic==MAGIC_FREE?"was ":""), head->File, head->Line);
@@ -680,10 +682,16 @@ void Heap_Stats(void)
 
 	Log_Log("Heap", "%i blocks (0x%x bytes)", nBlocks, totalBytes);
 	Log_Log("Heap", "%i free blocks (0x%x bytes)", nFree, freeBytes);
-	frag = (nFree-1)*10000/nBlocks;
+	if(nBlocks != 0)
+		frag = (nFree-1)*10000/nBlocks;
+	else
+		frag = 0;
 	Log_Log("Heap", "%i.%02i%% Heap Fragmentation", frag/100, frag%100);
 	avgAlloc = (totalBytes-freeBytes)/(nBlocks-nFree);
-	overhead = (sizeof(tHeapFoot)+sizeof(tHeapHead))*10000/avgAlloc;
+	if(avgAlloc != 0)
+		overhead = (sizeof(tHeapFoot)+sizeof(tHeapHead))*10000/avgAlloc;
+	else
+		overhead = 0;
 	Log_Log("Heap", "Average allocation: %i bytes, Average Overhead: %i.%02i%%",
 		avgAlloc, overhead/100, overhead%100
 		);