shishantbiswas/c3c
1
1
Fork 0
mirror of https://github.com/c3lang/c3c.git synced 2026-02-27 12:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix of allocator gen.

Browse Source
This commit is contained in:
Christoffer Lerno
2023-06-26 21:34:36 +02:00
parent 685be0981f
commit b88916214f
2 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/std/core/allocators/heap_allocator.c3
View File

@@ -38,18 +38,18 @@ fn void*! SimpleHeapAllocator.realloc(SimpleHeapAllocator* this, void* old_point
void* new = this.alloc(bytes)!;
usz max_to_copy = math::min(block.size, bytes);
mem::copy(new, old_pointer, max_to_copy);
this.free(old_pointer);
(void)this.free(old_pointer);
return new;
}
fn void*! SimpleHeapAllocator.calloc(SimpleHeapAllocator* this, usz bytes) @local
fn void*! SimpleHeapAllocator.calloc(SimpleHeapAllocator* this, usz bytes)
{
void* data = this.alloc(bytes)!;
mem::clear(data, bytes, mem::DEFAULT_MEM_ALIGNMENT);
return data;
}
fn void*! SimpleHeapAllocator.alloc(SimpleHeapAllocator* this, usz bytes) @local
fn void*! SimpleHeapAllocator.alloc(SimpleHeapAllocator* this, usz bytes)
{
usz aligned_bytes = mem::aligned_offset(bytes, mem::DEFAULT_MEM_ALIGNMENT);
if (!this.free_list)
@@ -105,11 +105,11 @@ fn void! SimpleHeapAllocator.add_block(SimpleHeapAllocator* this, usz aligned_by
Header* new_block = (Header*)result.ptr;
new_block.size = result.len - Header.sizeof;
new_block.next = null;
this.free(new_block + 1);
(void)this.free(new_block + 1);
}
fn void SimpleHeapAllocator.free(SimpleHeapAllocator* this, void* ptr) @local
fn void! SimpleHeapAllocator.free(SimpleHeapAllocator* this, void* ptr)
{
// Empty ptr -> do nothing.
if (!ptr) return;

38
lib/std/core/mem_allocator.c3
View File

@@ -8,20 +8,48 @@ const Allocator* LIBC_ALLOCATOR = &_SYSTEM_ALLOCATOR;
def AllocatorFunction = fn void*!(Allocator* allocator, usz new_size, usz alignment, usz offset, void* old_pointer, AllocationKind kind);
macro bool is_allocator($Type)
{
return $checks(
$Type mem,
usz sz = 1,
void*! x = mem.alloc(sz),
void*! y = mem.calloc(sz),
void*! z = mem.realloc(x, sz),
(void)mem.free(x)
);
}
macro bool is_valid_aligned_allocator($Type)
{
return !$checks($Type.alloc_aligned) ||
$checks(
$Type mem,
usz sz = 1,
void*! x = mem.alloc_aligned(sz, sz, az),
void*! y = mem.calloc_aligned(sz, sz, sz),
void*! z = mem.realloc_aligned(x, sz, sz, sz),
(void)mem.free_aligned(x, sz, sz)
);
}
/**
* @require is_allocator($AllocatorType) : "Type does not implement all allocator methods"
* @require is_valid_aligned_allocator($AllocatorType) : "Type does not implement all aligned methods"
**/
macro AllocatorFunction allocator_fn($AllocatorType)
{
return fn void*!(Allocator* data, usz size, usz alignment, usz offset, void* old_pointer, AllocationKind kind)
{
$AllocatorType* allocator = ($AllocatorType*)data;
bool $supports_aligned = $defined(allocator.aligned_alloc);
bool $supports_aligned = $defined(allocator.alloc_aligned);
switch (kind)
{
case CALLOC:
return allocator.calloc(size) @inline;
case ALIGNED_CALLOC:
$if $supports_aligned:
return allocator.aligned_calloc(size, alignment, offset) @inline;
return allocator.calloc_aligned(size, alignment, offset) @inline;
$else
return @aligned_calloc(allocator.calloc, size, alignment, offset);
$endif
@@ -29,7 +57,7 @@ macro AllocatorFunction allocator_fn($AllocatorType)
return allocator.alloc(size);
case ALIGNED_ALLOC:
$if $supports_aligned:
return allocator.aligned_alloc(size, alignment, offset) @inline;
return allocator.alloc_aligned(size, alignment, offset) @inline;
$else
return @aligned_alloc(allocator.alloc, size, alignment, offset);
$endif
@@ -37,13 +65,13 @@ macro AllocatorFunction allocator_fn($AllocatorType)
return allocator.realloc(old_pointer, size) @inline;
case ALIGNED_REALLOC:
$if $supports_aligned:
return allocator.aligned_realloc(old_pointer, size, alignment, offset) @inline;
return allocator.realloc_aligned(old_pointer, size, alignment, offset) @inline;
$else
return @aligned_realloc(allocator.alloc, allocator.free, old_pointer, size, alignment, offset);
$endif
case ALIGNED_FREE:
$if $supports_aligned:
allocator.aligned_free(old_pointer, alignment, offset) @inline!;
allocator.free_aligned(old_pointer, alignment, offset) @inline!;
return null;
$else
@aligned_free(allocator.free, old_pointer) @inline!;