oreodave/alisp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sys: plug in allocator

Browse Source
This commit is contained in:
Aryadev Chavali
2026-02-13 00:08:10 +00:00
committed by oreodave
parent f9a044f631
commit 9a91511e48
2 changed files with 5 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/alisp/sys.h
View File

@@ -8,19 +8,13 @@
#ifndef SYS_H #ifndef SYS_H
#define SYS_H #define SYS_H
#include <alisp/allocator.h>
#include <alisp/lisp.h> #include <alisp/lisp.h>
/// System context /// System context
typedef struct typedef struct
{ {
vec_t conses; arena_t memory;
vec_t vectors;
u64 num_conses, num_vectors;
} sys_mem_t;
typedef struct
{
sys_mem_t memory;
sym_table_t symtable; sym_table_t symtable;
} sys_t; } sys_t;

44
src/sys.c
View File

@@ -20,21 +20,8 @@ lisp_t *sys_alloc(sys_t *sys, tag_t type)
switch (type) switch (type)
{ {
case TAG_CONS: case TAG_CONS:
{
cons_t *cons = calloc(1, sizeof(*cons));
lisp_t *lisp = tag_cons(cons);
vec_append(&sys->memory.conses, &lisp, sizeof(&lisp));
sys->memory.num_conses++;
return lisp;
}
case TAG_VEC: case TAG_VEC:
{ return arena_make(&sys->memory, type);
vec_t *vec = calloc(1, sizeof(*vec));
lisp_t *lisp = tag_vec(vec);
vec_append(&sys->memory.vectors, &lisp, sizeof(&lisp));
sys->memory.num_vectors++;
return lisp;
}
// Shouldn't be registered // Shouldn't be registered
case TAG_NIL: case TAG_NIL:
case TAG_INT: case TAG_INT:
@@ -47,38 +34,13 @@ lisp_t *sys_alloc(sys_t *sys, tag_t type)
u64 sys_cost(sys_t *sys) u64 sys_cost(sys_t *sys)
{ {
u64 vec_capacity = 0; return arena_cost(&sys->memory) + sym_table_cost(&sys->symtable);
for (u64 i = 0; i < sys->memory.num_vectors; ++i)
{
lisp_t *vec = VEC_GET(&sys->memory.vectors, i, lisp_t *);
vec_capacity += as_vec(vec)->capacity;
}
return sym_table_cost(&sys->symtable) +
(sys->memory.num_conses * sizeof(cons_t)) + vec_capacity;
} }
void sys_free(sys_t *sys) void sys_free(sys_t *sys)
{ {
sym_table_free(&sys->symtable); sym_table_free(&sys->symtable);
arena_free(&sys->memory);
// Iterate through each cell of memory currently allocated and free them
for (size_t i = 0; i < VEC_SIZE(&sys->memory.conses, lisp_t **); ++i)
{
lisp_t *allocated = VEC_GET(&sys->memory.conses, i, lisp_t *);
lisp_free(allocated);
}
// Iterate through each cell of memory currently allocated and free them
for (size_t i = 0; i < VEC_SIZE(&sys->memory.vectors, lisp_t **); ++i)
{
lisp_t *allocated = VEC_GET(&sys->memory.vectors, i, lisp_t *);
lisp_free(allocated);
}
// Free the containers
vec_free(&sys->memory.conses);
vec_free(&sys->memory.vectors);
// Ensure no one treats this as active in any sense // Ensure no one treats this as active in any sense
memset(sys, 0, sizeof(*sys)); memset(sys, 0, sizeof(*sys));
} }