malloc macro cleanup

source/m3_code.c

@@ -16,7 +16,7 @@ IM3CodePage  NewCodePage  (u32 i_minNumLines)
     u32 pageSize = sizeof (M3CodePageHeader) + sizeof (code_t) * i_minNumLines;
 
     pageSize = (pageSize + (d_m3CodePageAlignSize-1)) & ~(d_m3CodePageAlignSize-1); // align
-    m3Malloc ((void **) & page, pageSize);
+    m3Alloc ((void **) & page, u8, pageSize);
 
     if (page)
     {

source/m3_core.c

@@ -40,7 +40,7 @@ static u8* fixedHeapLast = NULL;
 #   define HEAP_ALIGN_PTR(P)
 #endif
 
-M3Result  m3Malloc  (void ** o_ptr, size_t i_size)
+M3Result  m3_Malloc  (void ** o_ptr, size_t i_size)
 {
     u8 * ptr = fixedHeapPtr;
 
@@ -63,7 +63,7 @@ M3Result  m3Malloc  (void ** o_ptr, size_t i_size)
     return m3Err_none;
 }
 
-void        m3Free_impl             (void ** io_ptr)
+void        m3_Free              (void ** io_ptr)
 {
     if (!o_ptr) return;
 
@@ -79,7 +79,7 @@ void        m3Free_impl             (void ** io_ptr)
     * io_ptr = NULL;
 }
 
-void *  m3Realloc  (void * i_ptr, size_t i_newSize, size_t i_oldSize)
+void *  m3_Realloc  (void * i_ptr, size_t i_newSize, size_t i_oldSize)
 {
     //printf("== realloc %p => %d\n", i_ptr, i_newSize);
 
@@ -93,7 +93,7 @@ void *  m3Realloc  (void * i_ptr, size_t i_newSize, size_t i_oldSize)
         return ptr;
     }
 
-    m3Malloc(&ptr, i_newSize);
+    m3_Malloc(&ptr, i_newSize);
     if (!ptr) return NULL;
 
     if (i_ptr) {
@@ -106,7 +106,7 @@ void *  m3Realloc  (void * i_ptr, size_t i_newSize, size_t i_oldSize)
 
 #else
 
-M3Result  m3Malloc  (void ** o_ptr, size_t i_size)
+M3Result  m3_Malloc  (void ** o_ptr, size_t i_size)
 {
     M3Result result = m3Err_none;
 
@@ -121,14 +121,14 @@ M3Result  m3Malloc  (void ** o_ptr, size_t i_size)
     return result;
 }
 
-void  m3Free_impl  (void ** io_ptr)
+void  m3_Free  (void ** io_ptr)
 {
 //    if (i_ptr) printf("== free %p\n", i_ptr);
     free (* io_ptr);
     * io_ptr = NULL;
 }
 
-M3Result  m3Realloc  (void ** io_ptr, size_t i_newSize, size_t i_oldSize)
+M3Result  m3_Realloc  (void ** io_ptr, size_t i_newSize, size_t i_oldSize)
 {
     M3Result result = m3Err_none;
     
@@ -152,7 +152,7 @@ M3Result  m3Realloc  (void ** io_ptr, size_t i_newSize, size_t i_oldSize)
 }
 
 
-M3Result  m3CopyMem  (void ** o_to, cbytes_t i_from, size_t i_size)
+M3Result  m3_CopyMem  (void ** o_to, cbytes_t i_from, size_t i_size)
 {
     void * to = malloc (i_size);
     
@@ -478,7 +478,7 @@ M3Result  Read_utf8  (cstr_t * o_utf8, bytes_t * io_bytes, cbytes_t i_end)
             if (end <= i_end)
             {
                 char * utf8;
-                result = m3Malloc ((void **) & utf8, utf8Length + 1);
+                result = m3_Malloc ((void **) & utf8, utf8Length + 1);
 
                 if (not result)
                 {

source/m3_core.h

@@ -204,17 +204,16 @@ size_t      m3StackGetMax           ();
 void        m3Abort                 (const char* message);
 void        m3NotImplemented        (void);
 
-M3Result    m3Malloc                (void ** o_ptr, size_t i_size);
-M3Result    m3Realloc               (void ** io_ptr, size_t i_newSize, size_t i_oldSize);
-void        m3Free_impl             (void ** io_ptr);
-M3Result    m3CopyMem               (void ** o_to, cbytes_t i_from, size_t i_size);
-
-#define m3Alloc(OPTR, STRUCT, NUM)                  m3Malloc ((void **) OPTR, sizeof (STRUCT) * (NUM))
-#define m3ReallocArray(PTR, STRUCT, NEW, OLD)       m3Realloc ((void **) (PTR), sizeof (STRUCT) * (NEW), sizeof (STRUCT) * (OLD))
-#define m3Reallocate(_ptr, _newSize, _oldSize)      m3Realloc ((void **) _ptr, _newSize, _oldSize)
-#define CopyMem(_to, _from, _size)                  m3CopyMem ((void **) _to, _from, _size)
-
-#define m3Free(P)                                   m3Free_impl ((void **)(& P));
+M3Result    m3_Malloc                (void ** o_ptr, size_t i_size);
+M3Result    m3_Realloc               (void ** io_ptr, size_t i_newSize, size_t i_oldSize);
+void        m3_Free                  (void ** io_ptr);
+M3Result    m3_CopyMem               (void ** o_to, cbytes_t i_from, size_t i_size);
+
+#define m3Alloc(OPTR, STRUCT, NUM)                  m3_Malloc ((void **) OPTR, sizeof (STRUCT) * (NUM))
+#define m3ReallocArray(PTR, STRUCT, NEW, OLD)       m3_Realloc ((void **) (PTR), sizeof (STRUCT) * (NEW), sizeof (STRUCT) * (OLD))
+#define m3Reallocate(_ptr, _newSize, _oldSize)      m3_Realloc ((void **) _ptr, _newSize, _oldSize)
+#define m3Free(P)                                   m3_Free ((void **)(& P));
+#define m3CopyMem(_to, _from, _size)                m3_CopyMem ((void **) _to, _from, _size)
 
 M3Result    NormalizeType           (u8 * o_type, i8 i_convolutedWasmType);
 

source/m3_env.c

@@ -130,7 +130,7 @@ IM3Runtime  m3_NewRuntime  (IM3Environment i_environment, u32 i_stackSizeInBytes
 
         runtime->environment = i_environment;
 
-        m3Malloc (& runtime->stack, i_stackSizeInBytes);
+        m3Alloc (& runtime->stack, u8, i_stackSizeInBytes);
 
         if (runtime->stack)
         {

source/m3_parse.c

@@ -62,7 +62,7 @@ _           (ReadLEB_i7 (& form, & i_bytes, i_end));
 
 _           (ReadLEB_u32 (& ft->numArgs, & i_bytes, i_end));
 
-_           (m3Malloc (& ft->argTypes, ft->numArgs));
+_           (m3Alloc (& ft->argTypes, u8, ft->numArgs));
             
             for (u32 i = 0; i < ft->numArgs; ++i)
             {