refactor: xmake is now in use

This commit is contained in:
2026-05-26 13:52:28 -06:00
parent 78640a3288
commit 203b60cf65
8 changed files with 142 additions and 260 deletions

View File

@@ -1,4 +1,4 @@
#include "arena.h"
#include "lae_arena.h"
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
@@ -6,13 +6,12 @@
#include <string.h>
struct Arena {
uint8_t *buffer;
size_t capacity;
size_t offset;
uint8_t* buffer;
size_t capacity;
size_t offset;
};
ArenaErr arena_init(Arena **arena, size_t capacity) {
ArenaErr arena_init(Arena** arena, size_t capacity) {
if (arena == NULL) {
return ARENA_NULL_ARG;
}
@@ -21,20 +20,20 @@ ArenaErr arena_init(Arena **arena, size_t capacity) {
return ARENA_INVALID_SIZE;
}
Arena *new_arena = malloc(sizeof(Arena));
Arena* new_arena = malloc(sizeof(Arena));
if (new_arena == NULL) {
return ARENA_BAD_ALLOC;
}
void *buffer = malloc(capacity);
void* buffer = malloc(capacity);
if (buffer == NULL) {
return ARENA_BAD_ALLOC;
}
*new_arena = (Arena) {
.buffer = buffer,
*new_arena = (Arena){
.buffer = buffer,
.capacity = capacity,
.offset = 0,
.offset = 0,
};
*arena = new_arena;
@@ -42,14 +41,14 @@ ArenaErr arena_init(Arena **arena, size_t capacity) {
return ARENA_OK;
}
ArenaErr arena_destroy(Arena **arena) {
ArenaErr arena_destroy(Arena** arena) {
if (arena == NULL || *arena == NULL) {
return ARENA_NULL_ARG;
}
free((*arena)->buffer);
(*arena)->buffer = NULL;
(*arena)->offset = 0;
(*arena)->buffer = NULL;
(*arena)->offset = 0;
(*arena)->capacity = 0;
free(*arena);
*arena = NULL;
@@ -57,44 +56,47 @@ ArenaErr arena_destroy(Arena **arena) {
return ARENA_OK;
}
ArenaPointer arena_alloc(Arena *arena, size_t size, size_t alignment) {
ArenaPointer arena_alloc(Arena* arena, size_t size, size_t alignment) {
if (arena == NULL) {
return (ArenaPointer) {.is_valid = false, .err = ARENA_NULL_ARG};
return (ArenaPointer){.is_valid = false, .err = ARENA_NULL_ARG};
}
if (size < 1) {
return (ArenaPointer) {.is_valid = false, .err = ARENA_INVALID_SIZE};
return (ArenaPointer){.is_valid = false, .err = ARENA_INVALID_SIZE};
}
if (alignment < 1) {
return (ArenaPointer) {.is_valid = false, .err = ARENA_INVALID_ALIGN};
return (ArenaPointer){.is_valid = false, .err = ARENA_INVALID_ALIGN};
}
ArenaSizeResult padding = arena_get_align_padding(arena, alignment);
if (!padding.is_valid) {
return (ArenaPointer) {.is_valid = false, .err = padding.err};
return (ArenaPointer){.is_valid = false, .err = padding.err};
}
ArenaErr cap_err = arena_ensure_capacity(arena, size, alignment);
if(cap_err != ARENA_OK) {
return (ArenaPointer) {.is_valid = false, .err = ARENA_OUT_OF_SPACE};
if (cap_err != ARENA_OK) {
return (ArenaPointer){.is_valid = false, .err = ARENA_OUT_OF_SPACE};
}
if (arena->offset + padding.val + size > arena->capacity) {
return (ArenaPointer) {.is_valid = false, .err = ARENA_OUT_OF_SPACE};
return (ArenaPointer){.is_valid = false, .err = ARENA_OUT_OF_SPACE};
}
if (arena->offset > SIZE_MAX - padding.val - size) {
return (ArenaPointer) {.is_valid = false, .err = ARENA_CAPACITY_OVERFLOW};
return (ArenaPointer){.is_valid = false,
.err = ARENA_CAPACITY_OVERFLOW};
}
size_t aligned_offset = arena->offset + padding.val;
arena->offset = aligned_offset + size;
return (ArenaPointer) {.is_valid = true, .offset = aligned_offset, .arena = arena};
return (ArenaPointer){.is_valid = true,
.offset = aligned_offset,
.arena = arena};
}
ArenaErr arena_ensure_capacity(Arena *arena, size_t size, size_t alignment) {
ArenaErr arena_ensure_capacity(Arena* arena, size_t size, size_t alignment) {
if (arena == NULL) {
return ARENA_NULL_ARG;
}
@@ -150,38 +152,36 @@ ArenaErr arena_ensure_capacity(Arena *arena, size_t size, size_t alignment) {
}
}
ArenaPointer arena_push(Arena *arena, void *data, size_t size, size_t alignment) {
ArenaPointer
arena_push(Arena* arena, void* data, size_t size, size_t alignment) {
if (arena == NULL || data == NULL) {
return (ArenaPointer) {.is_valid = false, .err = ARENA_NULL_ARG};
return (ArenaPointer){.is_valid = false, .err = ARENA_NULL_ARG};
}
if (size < 1) {
return (ArenaPointer) {.is_valid = false, .err = ARENA_INVALID_SIZE};
return (ArenaPointer){.is_valid = false, .err = ARENA_INVALID_SIZE};
}
if (size < 1) {
return (ArenaPointer) {.is_valid = false, .err = ARENA_INVALID_ALIGN};
return (ArenaPointer){.is_valid = false, .err = ARENA_INVALID_ALIGN};
}
ArenaErr err = arena_ensure_capacity(arena, size, alignment);
if (err != ARENA_OK) {
return (ArenaPointer) {.is_valid = false, .err = err};
return (ArenaPointer){.is_valid = false, .err = err};
}
ArenaPointer pointer = arena_alloc(arena, size, alignment);
if (!pointer.is_valid) {
return pointer;
}
memcpy(
arena_unwrap_pointer(pointer),
data,
size);
memcpy(arena_unwrap_pointer(pointer), data, size);
return pointer;
}
ArenaErr arena_realloc(Arena *arena, size_t new_capacity) {
ArenaErr arena_realloc(Arena* arena, size_t new_capacity) {
if (arena == NULL) {
return ARENA_NULL_ARG;
}
@@ -190,43 +190,36 @@ ArenaErr arena_realloc(Arena *arena, size_t new_capacity) {
return ARENA_INVALID_SIZE;
}
uint8_t *tmp = realloc(arena->buffer, new_capacity);
uint8_t* tmp = realloc(arena->buffer, new_capacity);
if (tmp == NULL) {
return ARENA_BAD_ALLOC;
}
arena->buffer = tmp;
arena->buffer = tmp;
arena->capacity = new_capacity;
return ARENA_OK;
}
ArenaSizeResult arena_get_align_padding(Arena *arena, size_t alignment) {
ArenaSizeResult arena_get_align_padding(Arena* arena, size_t alignment) {
if (arena == NULL) {
return (ArenaSizeResult){ .is_valid = false, .err = ARENA_NULL_ARG };
return (ArenaSizeResult){.is_valid = false, .err = ARENA_NULL_ARG};
}
if (alignment == 0 || (alignment & (alignment - 1)) != 0) {
return (ArenaSizeResult){ .is_valid = false, .err = ARENA_INVALID_ALIGN };
return (ArenaSizeResult){.is_valid = false, .err = ARENA_INVALID_ALIGN};
}
uintptr_t current_address = (uintptr_t)(arena->buffer + arena->offset);
size_t mask = alignment - 1;
size_t mask = alignment - 1;
size_t padding = (size_t)(-current_address) & mask;
return (ArenaSizeResult){
.is_valid = true,
.val = padding
};
return (ArenaSizeResult){.is_valid = true, .val = padding};
}
void *arena_unwrap_pointer(ArenaPointer p) {
void* arena_unwrap_pointer(ArenaPointer p) {
if (!p.is_valid) {
return NULL;
}
return p.arena->buffer + p.offset;
}

View File

@@ -1,4 +1,4 @@
#include "arena.h"
#include "lae_arena.h"
#include <stdlib.h>
int main(void) {