Removed legacy memory allocator

Author: apaillier-ledger

src/mem.c

@@ -11,12 +11,9 @@
 #include "mem_alloc.h"
 #include "os_print.h"
 
-#define SIZE_MEM_BUFFER_MAIN 10240
-#define SIZE_MEM_BUFFER_ALT  2048
-#define SIZE_MEM_BUFFER      (SIZE_MEM_BUFFER_MAIN + SIZE_MEM_BUFFER_ALT)
+#define SIZE_MEM_BUFFER (1024 * 12)
 
 static uint8_t mem_buffer[SIZE_MEM_BUFFER] __attribute__((aligned(sizeof(intmax_t))));
-static uint16_t mem_legacy_idx;
 static mem_ctx_t mem_ctx = NULL;
 
 #ifdef HAVE_MEMORY_PROFILING
@@ -55,59 +52,3 @@ void app_mem_free_impl(void *ptr, const char *file, int line) {
 #endif
     mem_free(mem_ctx, ptr);
 }
-
-/**
- * Initializes the memory buffer index
- */
-void mem_legacy_init(void) {
-    mem_legacy_idx = 0;
-    // initialize the new allocator to still be able to use it, just in case
-    mem_ctx = mem_init(mem_buffer + SIZE_MEM_BUFFER_MAIN, SIZE_MEM_BUFFER_ALT);
-}
-
-/**
- * Resets the memory buffer index
- */
-void mem_legacy_reset(void) {
-    mem_legacy_init();
-}
-
-/**
- * Allocates (push) a chunk of the memory buffer of a given size.
- *
- * Checks to see if there are enough space left in the memory buffer, returns
- * the current location in the memory buffer and moves the index accordingly.
- *
- * @param[in] size Requested allocation size in bytes
- * @return Allocated memory pointer; \ref NULL if not enough space left.
- */
-void *mem_legacy_alloc(size_t size) {
-    size_t new_idx;
-
-    if (__builtin_add_overflow((size_t) mem_legacy_idx, size, &new_idx)) {
-        PRINTF("Error: overflow detected!\n");
-        return NULL;
-    }
-    // Buffer exceeded
-    if (new_idx > SIZE_MEM_BUFFER_MAIN) {
-        PRINTF("Error: mem_alloc(%u) failed!\n", size);
-        return NULL;
-    }
-    mem_legacy_idx += size;
-    return &mem_buffer[mem_legacy_idx - size];
-}
-
-/**
- * De-allocates (pop) a chunk of memory buffer by a given size.
- *
- * @param[in] size Requested deallocation size in bytes
- */
-void mem_legacy_dealloc(size_t size) {
-    // More than is already allocated
-    if (size > mem_legacy_idx) {
-        PRINTF("Warning: mem_dealloc(%u) with a value larger than allocated!\n", size);
-        mem_legacy_idx = 0;
-    } else {
-        mem_legacy_idx -= size;
-    }
-}

src/mem.h

@@ -16,8 +16,3 @@
 bool app_mem_init(void);
 void *app_mem_alloc_impl(size_t size, const char *file, int line);
 void app_mem_free_impl(void *ptr, const char *file, int line);
-
-void mem_legacy_init(void);
-void mem_legacy_reset(void);
-void *mem_legacy_alloc(size_t size);
-void mem_legacy_dealloc(size_t size);

src/mem_utils.c

@@ -28,36 +28,6 @@ const char *mem_alloc_and_format_uint(uint32_t value) {
     return mem_ptr;
 }
 
-/**
- * Align memory by a given value
- *
- * @param[in] alignment given alignment value
- * @return size of the padding required for proper alignment
- */
-uint8_t mem_legacy_align(size_t alignment) {
-    uint8_t diff = (uintptr_t) mem_legacy_alloc(0) % alignment;
-
-    if (diff > 0) {
-        diff = alignment - diff;
-        mem_legacy_alloc(diff);
-    }
-    return diff;
-}
-
-/**
- * Allocate and align, required when dealing with pointers of multi-bytes data
- * like structures that will be dereferenced at runtime.
- *
- * @param[in] size the size of the data we want to allocate in memory
- * @param[in] alignment the byte alignment needed
- *
- * @return pointer to the memory area, \ref NULL if the allocation failed
- */
-void *mem_legacy_alloc_and_align(size_t size, size_t alignment) {
-    mem_legacy_align(alignment);
-    return mem_legacy_alloc(size);
-}
-
 char *app_mem_strdup(const char *src) {
     char *dst;
     size_t length = strlen(src) + 1;

src/mem_utils.h

@@ -2,9 +2,5 @@
 
 #include <stdint.h>
 
-#define MEM_ALLOC_AND_ALIGN_TYPE(type) mem_legacy_alloc_and_align(sizeof(type), __alignof__(type))
-
 const char *mem_alloc_and_format_uint(uint32_t value);
-uint8_t mem_legacy_align(size_t alignment);
-void *mem_legacy_alloc_and_align(size_t size, size_t alignment);
 char *app_mem_strdup(const char *s);