From 1f28c3c733ea3ae4234bff91e1c55e61b1ee3e96 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Wed, 31 Jul 2019 01:25:05 +0200
Subject: Starting on asm, implementing extern function call so progress is
 visible

---
 src/std/scoped_allocator.c | 110 ---------------------------------------------
 1 file changed, 110 deletions(-)
 delete mode 100644 src/std/scoped_allocator.c

(limited to 'src/std/scoped_allocator.c')

diff --git a/src/std/scoped_allocator.c b/src/std/scoped_allocator.c
deleted file mode 100644
index d8acbf6..0000000
--- a/src/std/scoped_allocator.c
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "../../include/std/scoped_allocator.h"
-#include "../../include/std/alloc.h"
-#include "../../include/std/thread.h"
-#include "../../include/std/log.h"
-#include <assert.h>
-
-#define ALLOC_NODE_SIZE 4096
-
-int scoped_allocator_node_init(ScopedAllocatorNode *self) {
-    self->data = NULL;
-    self->size = 0;
-    self->next = NULL;
-    return am_malloc(ALLOC_NODE_SIZE, (void**)&self->data);
-}
-
-void scoped_allocator_node_deinit(ScopedAllocatorNode *self) {
-    am_free(self->data);
-    self->data = NULL;
-    self->size = 0;
-    if(self->next) {
-        scoped_allocator_node_deinit(self->next);
-        am_free(self->next);
-        self->next = NULL;
-    }
-}
-
-int scoped_allocator_init(ScopedAllocator *self) {
-    return_if_error(scoped_allocator_node_init(&self->head));
-    self->current = &self->head;
-    return buffer_init(&self->mems, NULL);
-}
-
-static void scoped_allocator_deinit_buffers(ScopedAllocator *self) {
-    void **mem;
-    void **mems_end;
-    mem = buffer_begin(&self->mems);
-    mems_end = buffer_end(&self->mems);
-    while(mem != mems_end) {
-        am_free(*mem);
-        ++mem;
-    }
-    buffer_deinit(&self->mems);
-}
-
-void scoped_allocator_deinit(ScopedAllocator *self) {
-    self->current = NULL;
-    scoped_allocator_deinit_buffers(self);
-    scoped_allocator_node_deinit(&self->head);
-}
-
-static CHECK_RESULT int scoped_allocator_ensure_capacity_for(ScopedAllocator *self, usize size) {
-    void *new_node;
-    new_node = NULL;
-    
-    if(self->current->size + size > ALLOC_NODE_SIZE) {
-        return_if_error(am_malloc(sizeof(ScopedAllocatorNode), &new_node));
-        cleanup_if_error(scoped_allocator_node_init(new_node));
-        self->current->next = new_node;
-        self->current = new_node;
-    }
-    return ALLOC_OK;
-
-    cleanup:
-    if(new_node)
-        am_free(new_node);
-    return ALLOC_FAIL;
-}
-
-static void* align_ptr_ceil(void *ptr, uintptr_t alignment) {
-    uintptr_t ptrval;
-    ptrval = (uintptr_t)ptr;
-    return (void*)((ptrval + alignment + 1) & ~(alignment - 1));
-}
-
-static usize align_ptr_ceil_offset(void *ptr, uintptr_t alignment) {
-    return (uintptr_t)align_ptr_ceil(ptr, alignment) - (uintptr_t)ptr;
-}
-
-#define SCOPED_ALLOC_ALIGNMENT 8
-
-int scoped_allocator_alloc(ScopedAllocator *self, usize size, void **mem) {
-    ScopedAllocatorNode *current;
-    usize alloc_size;
-    assert(self->current);
-    current = self->current;
-
-    if(size >= ALLOC_NODE_SIZE) {
-        amal_log_error("scoped_allocator_alloc: tried to alloc memory of size %lu. Max allowed alloc size is %lu", size, ALLOC_NODE_SIZE);
-        return -1;
-    }
-
-    alloc_size = size + align_ptr_ceil_offset(self->current->data + self->current->size, SCOPED_ALLOC_ALIGNMENT);
-    return_if_error(scoped_allocator_ensure_capacity_for(self, alloc_size));
-    /* Reallocated (new node created) */
-    if(self->current != current) {
-        *mem = self->current->data;
-        self->current->size += size;
-    } else {
-        *mem = align_ptr_ceil(self->current->data + self->current->size, SCOPED_ALLOC_ALIGNMENT);
-        self->current->size += alloc_size;
-    }
-    return 0;
-}
-
-int scoped_allocator_add_mem(ScopedAllocator *self, usize *result_index) {
-    void *null_data;
-    null_data = NULL;
-    *result_index = buffer_get_size(&self->mems, sizeof(void*));
-    return buffer_append(&self->mems, &null_data, sizeof(void*));
-}
-- 
cgit v1.2.3