summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2023-08-09 20:55:50 -0400
committerGitHub <noreply@github.com>2023-08-09 20:55:50 -0400
commit56b4e612cc8fc1af7c051592e850ca1aac02e39e (patch)
tree1b0a4d9fd080bc49d9a8779b5ed073df7c626a71 /include
parentc7729c05c07cf0d60a70cd6c4f456069604a1f43 (diff)
`m_malloc.c` (#41)
* match * bss * format * fix
Diffstat (limited to 'include')
-rw-r--r--include/code_variables.h3
-rw-r--r--include/m_malloc.h16
2 files changed, 9 insertions, 10 deletions
diff --git a/include/code_variables.h b/include/code_variables.h
index 6ed39f3..d038f7e 100644
--- a/include/code_variables.h
+++ b/include/code_variables.h
@@ -1909,8 +1909,7 @@ extern struct_debug_mode *debug_mode;
// extern UNK_TYPE B_80141E04_jp;
// extern UNK_TYPE B_80141E10_jp;
// extern UNK_TYPE B_80141E18_jp;
-// extern UNK_TYPE zelda_arena;
-// extern UNK_TYPE B_80141FC8_jp;
+
// extern UNK_TYPE B_80141FE0_jp;
// extern UNK_TYPE B_80141FF0_jp;
// extern UNK_TYPE B_80142410_jp;
diff --git a/include/m_malloc.h b/include/m_malloc.h
index 24b46d5..955baa2 100644
--- a/include/m_malloc.h
+++ b/include/m_malloc.h
@@ -3,15 +3,15 @@
#include "ultra64.h"
-// void zelda_malloc();
+void* zelda_malloc(size_t size);
void* zelda_malloc_r(size_t size);
-// void zelda_realloc();
-void* zelda_free(void* ptr);
-// void zelda_calloc();
-// void zelda_GetFreeArena();
-// void zelda_CheckArena();
-// void zelda_InitArena();
-// void zelda_CleanupArena();
+void* zelda_realloc(void* ptr, size_t size);
+void zelda_free(void* ptr);
+void* zelda_calloc(s32 num, size_t size);
+void zelda_GetFreeArena(size_t* outMaxFree, size_t* outFree, size_t* outAlloc);
+s32 zelda_CheckArena(void);
+void zelda_InitArena(void* heap, size_t size);
+void zelda_CleanupArena(void);
s32 zelda_MallocIsInitalized(void);
#endif