mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-05 15:34:41 +00:00
Code Issues Projects Releases Wiki Activity

[ntsc-1.2] Match __osMalloc.c and code_800FC620.c (new/delete) (#2106)

Browse source 
* 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
This commit is contained in:
cadmic 2024-09-04 02:10:14 -07:00 • committed by GitHub
parent af24970d89
commit c6d7cc7697
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 682 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

72
osMalloc.h Normal file
View file

@ -0,0 +1,72 @@
#ifndef OSMALLOC_H
#define OSMALLOC_H
#include "ultra64.h"
struct ArenaNode;
typedef struct Arena {
/* 0x00 */ struct ArenaNode* head;
/* 0x04 */ void* start;
#if PLATFORM_N64
/* 0x08 */ u32 size;
/* 0x0C */ u8 allocFailures;
#else
/* 0x08 */ OSMesgQueue lockQueue;
/* 0x20 */ u8 allocFailures; // only used in non-debug builds
/* 0x21 */ u8 isInit;
/* 0x22 */ u8 flag;
#endif
} Arena; // size = 0x10 (N64), size = 0x24 (GC)
typedef struct ArenaNode {
/* 0x00 */ s16 magic;
/* 0x02 */ s16 isFree;
/* 0x04 */ u32 size;
/* 0x08 */ struct ArenaNode* next;
/* 0x0C */ struct ArenaNode* prev;
#if PLATFORM_N64 || OOT_DEBUG
/* 0x10 */ const char* filename;
/* 0x14 */ int line;
/* 0x18 */ OSId threadId;
/* 0x1C */ Arena* arena;
/* 0x20 */ OSTime time;
/* 0x28 */ u8 unk_28[0x30-0x28]; // probably padding
#endif
} ArenaNode; // size = 0x30 (N64 and GC debug), size = 0x10 (GC retail)
#if PLATFORM_N64
#define DECLARE_INTERRUPT_MASK OSIntMask __mask;
#define CLEAR_INTERRUPTS() __mask = osSetIntMask(OS_IM_NONE)
#define DISABLE_INTERRUPTS() __mask = osSetIntMask(OS_IM_NONE)
#define RESTORE_INTERRUPTS() osSetIntMask(__mask)
#else
#define DECLARE_INTERRUPT_MASK
#define CLEAR_INTERRUPTS() (void)0
#define DISABLE_INTERRUPTS() (void)0
#define RESTORE_INTERRUPTS() (void)0
#endif
void __osMallocInit(Arena* arena, void* start, s32 size);
void __osMallocCleanup(Arena* arena);
s32 __osMallocIsInitialized(Arena* arena);
void* __osMalloc(Arena* arena, u32 size);
void* __osMallocR(Arena* arena, u32 size);
void __osFree(Arena* arena, void* ptr);
void* __osRealloc(Arena* arena, void* ptr, u32 newSize);
void ArenaImpl_GetSizes(Arena* arena, u32* outMaxFree, u32* outFree, u32* outAlloc);
s32 __osCheckArena(Arena* arena);
#if OOT_DEBUG
void* __osMallocDebug(Arena* arena, u32 size, const char* file, int line);
void* __osMallocRDebug(Arena* arena, u32 size, const char* file, int line);
void __osFreeDebug(Arena* arena, void* ptr, const char* file, int line);
void* __osReallocDebug(Arena* arena, void* ptr, u32 newSize, const char* file, int line);
void __osDisplayArena(Arena* arena);
extern u32 __osMalloc_FreeBlockTest_Enable;
#else
extern u32 gTotalAllocFailures;
#endif
#endif