From c6d7cc7697c67989b1f018ae2bc934f6677c09b7 Mon Sep 17 00:00:00 2001 From: cadmic Date: Wed, 4 Sep 2024 02:10:14 -0700 Subject: [ntsc-1.2] Match __osMalloc.c and code_800FC620.c (new/delete) (#2106) * Match __osMalloc * Match src/code/code_800FC620.c (new/delete) * Wrap versions-specific files in ifdefs to fix compilation * Fix bss * Remove {FAULT,RAND,OSMALLOC}_VERSION in favor of PLATFORM_N64 * Fix __osMalloc data splits, add unused strings * __osMalloc.h -> osMalloc.h * Fix merge --- src/code/system_malloc.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/code/system_malloc.c') diff --git a/src/code/system_malloc.c b/src/code/system_malloc.c index 8385a883c..de6a56b30 100644 --- a/src/code/system_malloc.c +++ b/src/code/system_malloc.c @@ -1,4 +1,5 @@ #include "global.h" +#include "osMalloc.h" #define LOG_SEVERITY_NOLOG 0 #define LOG_SEVERITY_ERROR 2 @@ -6,16 +7,6 @@ Arena gSystemArena; -#if PLATFORM_N64 -#define DECLARE_INTERRUPT_MASK OSIntMask __mask; -#define DISABLE_INTERRUPTS() __mask = osSetIntMask(OS_IM_NONE) -#define RESTORE_INTERRUPTS() osSetIntMask(__mask) -#else -#define DECLARE_INTERRUPT_MASK -#define DISABLE_INTERRUPTS() (void)0 -#define RESTORE_INTERRUPTS() (void)0 -#endif - #if OOT_DEBUG s32 gSystemArenaLogSeverity = LOG_SEVERITY_NOLOG; @@ -176,6 +167,6 @@ void SystemArena_Cleanup(void) { __osMallocCleanup(&gSystemArena); } -u8 SystemArena_IsInitialized(void) { +s32 SystemArena_IsInitialized(void) { return __osMallocIsInitialized(&gSystemArena); } -- cgit v1.2.3