Removed old commented-out code in heap.c

src/heap.c

@@ -6,153 +6,6 @@
 #include "stdio.h"
 #include "types/status.h"
 
-/*
-
-#define AVAIL 0
-#define UNAVAIL 1
-#define ALLOCATED 2
-
-struct heap_t
-{
-    void *base;
-    struct heap_node_t *header;
-    size_t heap_size;
-    size_t block_size;
-    size_t tree_height;
-} system_heap;
-
-struct heap_node_t
-{
-    size_t mapped : 1;
-    size_t state : 2;
-    size_t height : 5;
-} __attribute__ ((packed));
-
-size_t find_free_block(struct heap_t *heap, size_t height)
-{
-    if(height > heap->tree_height)
-    {
-        return 0;
-    }
-    for(size_t index = 1 << (heap->tree_height - height); index < 1 << (heap->tree_height - height + 1); index++)
-    {
-        if(heap->header[index].state == AVAIL)
-        {
-            return index;
-        }
-    }
-    size_t index = find_free_block(heap, height + 1);
-    if(index)
-    {
-        heap->header[index].state = UNAVAIL;
-        heap->header[index << 1].state = AVAIL;
-        heap->header[(index << 1) ^ 1].state = AVAIL;
-    }
-    return index << 1;
-}
-
-int map_region(struct heap_t *heap, size_t height, size_t index)
-{
-    int status = 0;
-    if(heap->header[index].mapped == 0)
-    {
-        if(height > 0)
-        {
-            status = map_region(heap, height - 1, index << 1);
-            if(status == 0)
-            {
-                status = map_region(heap, height - 1, (index << 1) ^ 1);
-            }
-        }
-        else
-        {
-            void *ptr = (void*) ((size_t) heap->base + (heap->block_size << height) * (index - (1 << (heap->tree_height - height))));
-            if((page_type(ptr) & PAGE_PRESENT) == 0)
-            {
-                status = map_page(ptr, reserve_page(), PAGE_RW);
-            }
-        }
-        heap->header[index].mapped = 1;
-    }
-    return status;
-}
-
-int heap_contruct(struct heap_t *heap, void *base, void *start, size_t heap_size, size_t block_size)
-{
-    heap->base = base;
-    heap->header = (struct heap_node_t*) start;
-    heap->heap_size = heap_size;
-    heap->block_size = block_size;
-    heap->tree_height = llog2(heap_size / block_size);
-    size_t header_size = (heap_size / block_size) << 1;
-    for(size_t i = 1; i <= (heap_size / block_size) * 2; i++)
-    {
-        //printf("%i\n",i);
-        int flags = page_type((void*) heap->header + i);
-        if((flags & PAGE_PRESENT) == 0)
-        {
-            int status = map_page((void*)heap->header + i, reserve_page(), PAGE_RW);
-            if(status != ENONE)
-            {
-                return status;
-            }
-        }
-        heap->header[i].state = UNAVAIL;
-        heap->header[i].mapped = 0;
-    }
-    for(size_t i = 0; i < heap_size / block_size; i++)
-    {
-        if(block_size * i >= header_size + (start - base))
-        {
-            size_t index = i + (1 << heap->tree_height);
-            heap->header[index].state = AVAIL;
-            for(; index > 1 && heap->header[index ^ 1].state == 0; index >>= 1)
-            {
-                heap->header[index].state = UNAVAIL;
-                heap->header[index ^ 1].state = UNAVAIL;
-                heap->header[index >> 1].state = AVAIL;
-            }
-        }
-        else
-        {
-            heap->header[i + (1 << heap->tree_height)].state = UNAVAIL;
-        }
-    }
-    return ENONE;
-}
-
-void *heap_allocate(struct heap_t *heap, size_t size)
-{
-    size += heap->block_size - 1;
-    size -= size % heap->block_size;
-    size_t height = llog2(size / heap->block_size);
-    size_t index = find_free_block(heap, height);
-    if(index)
-    {
-        heap->header[index].state = ALLOCATED;
-        void *ptr = (void*) ((size_t) heap->base + (heap->block_size << height) * (index - (1 << (heap->tree_height - height))));
-        map_region(heap, height, index);
-        return ptr;
-    }
-    return NULL;
-}
-
-void heap_free(struct heap_t *heap, void *ptr)
-{
-    size_t offset = (size_t) ptr - (size_t) heap->base;
-    size_t index = (offset / heap->block_size) + (1 << heap->tree_height);
-    for(; index > 0 && heap->header[index].state == UNAVAIL; index >>= 1);
-    heap->header[index].state = AVAIL;
-    for(; index > 1 && heap->header[index ^ 1].state == AVAIL; index >>= 1)
-    {
-        heap->header[index].state = UNAVAIL;
-        heap->header[index ^ 1].state = UNAVAIL;
-        heap->header[index >> 1].state = AVAIL;
-    }
-}
-
-*/
-
 bitmap_heap_descriptor_t system_heap;
 
 static int map_block(void *location, unsigned long size)