Fixed bug where system would lock if a user task segfaulted (forgot to sti)

[tpg/acess2.git] / Kernel / heap.c

diff --git a/Kernel/heap.c b/Kernel/heap.c
index e5a3723..0bffaec 100644 (file)
--- a/Kernel/heap.c
+++ b/Kernel/heap.c
@@ -7,6 +7,7 @@
 #include <heap.h>
 
 #define WARNINGS       1
+#define        DEBUG_TRACE     0
 
 // === CONSTANTS ===
 #define HEAP_BASE      0xE0800000
@@ -175,6 +176,9 @@ void *malloc(size_t Bytes)
                if(head->Size == Bytes) {
                        head->Magic = MAGIC_USED;
                        RELEASE(&giHeapSpinlock);       // Release spinlock
+                       #if DEBUG_TRACE
+                       LOG("RETURN %p, to %p", best->Data, __builtin_return_address(0));
+                       #endif
                        return best->Data;
                }
                
@@ -204,6 +208,9 @@ void *malloc(size_t Bytes)
                // Check size
                if(best->Size == Bytes) {
                        RELEASE(&giHeapSpinlock);       // Release spinlock
+                       #if DEBUG_TRACE
+                       LOG("RETURN %p, to %p", best->Data, __builtin_return_address(0));
+                       #endif
                        return best->Data;
                }
        }
@@ -222,6 +229,9 @@ void *malloc(size_t Bytes)
        best->Magic = MAGIC_USED;       // Mark block as used
        
        RELEASE(&giHeapSpinlock);       // Release spinlock
+       #if DEBUG_TRACE
+       LOG("RETURN %p, to %p", best->Data, __builtin_return_address(0));
+       #endif
        return best->Data;
 }
 
@@ -234,12 +244,14 @@ void free(void *Ptr)
        tHeapHead       *head;
        tHeapFoot       *foot;
        
+       #if DEBUG_TRACE
        LOG("Ptr = %p", Ptr);
        LOG("Returns to %p", __builtin_return_address(0));
+       #endif
        
        // Alignment Check
        if( (Uint)Ptr & (sizeof(Uint)-1) ) {
-               Warning("free - Passed a non-aligned address (%p)\n", Ptr);
+               Warning("free - Passed a non-aligned address (%p)", Ptr);
                return;
        }
        
@@ -253,7 +265,7 @@ void free(void *Ptr)
        // Check memory block - Header
        head = (void*)( (Uint)Ptr - sizeof(tHeapHead) );
        if(head->Magic == MAGIC_FREE) {
-               Warning("free - Passed a freed block (%p)\n", head);
+               Warning("free - Passed a freed block (%p) by %p", head, __builtin_return_address(0));
                return;
        }
        if(head->Magic != MAGIC_USED) {
@@ -268,7 +280,7 @@ void free(void *Ptr)
                return;
        }
        if(foot->Magic != MAGIC_FOOT) {
-               Warning("free - Footer magic is invalid (%p, 0x%x)\n", head, foot->Magic);
+               Warning("free - Footer magic is invalid (%p, %p = 0x%x)\n", head, &foot->Magic, foot->Magic);
                return;
        }
        
@@ -356,6 +368,23 @@ void *realloc(void *__ptr, size_t __size)
        return NULL;
 }
 
+/**
+ * \fn int IsHeap(void *Ptr)
+ * \brief Checks if an address is a heap address
+ */
+int IsHeap(void *Ptr)
+{
+       tHeapHead       *head;
+       if((Uint)Ptr < (Uint)gHeapStart)        return 0;
+       if((Uint)Ptr > (Uint)gHeapEnd)  return 0;
+       
+       head = (void*)( (Uint)Ptr - sizeof(tHeapHead) );
+       if(head->Magic != MAGIC_USED && head->Magic != MAGIC_FREE)
+               return 0;
+       
+       return 1;
+}
+
 #if WARNINGS
 void Heap_Dump()
 {