diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2022-01-11 20:25:14 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-11 23:25:14 +0000 |
| commit | c44e26a14356be233402fc98a44681c37ae45761 (patch) | |
| tree | 6254c3534bbaec9e8ae05055c6cbd431a712dd48 /src/boot_O2/system_malloc.c | |
| parent | 133e02a8a744ec7252b71ca5a0e310367dae037d (diff) | |
`__osMalloc.c` OK (#395)
* __osRealloc
* match __osCheckArena
* cleanup
* Import bss, unreferenced strings and cleanup
* format
* Reviews
* Move convert.h to ultra64/
* Make the os_malloc.h header
* potato
* renames and fixes
* format
* small doc pass
}
* format
* minor changes
* Introduce system_malloc.h
* Docs pass
* fix
* format
* stuff
* Apply suggestions from code review
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* review
* format
* remove repeated sentence
* Apply suggestions from code review
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* include headers
* review
* Rename __osMallocAddHeap
* remove @brief
* Update src/boot_O2/__osMalloc.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Diffstat (limited to 'src/boot_O2/system_malloc.c')
| -rw-r--r-- | src/boot_O2/system_malloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/boot_O2/system_malloc.c b/src/boot_O2/system_malloc.c index ad2bb6345..56608166c 100644 --- a/src/boot_O2/system_malloc.c +++ b/src/boot_O2/system_malloc.c @@ -1,4 +1,5 @@ #include "global.h" +#include "os_malloc.h" Arena gSystemArena; @@ -29,8 +30,8 @@ void* SystemArena_Calloc(u32 elements, size_t size) { return ptr; } -void SystemArena_AnalyzeArena(size_t* maxFreeBlock, size_t* bytesFree, size_t* bytesAllocated) { - __osAnalyzeArena(&gSystemArena, maxFreeBlock, bytesFree, bytesAllocated); +void SystemArena_GetSizes(size_t* maxFreeBlock, size_t* bytesFree, size_t* bytesAllocated) { + __osGetSizes(&gSystemArena, maxFreeBlock, bytesFree, bytesAllocated); } u32 SystemArena_CheckArena(void) { |