kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Match most of data.c

Browse source
This commit is contained in:
gamemasterplc 2023-11-24 12:29:41 -06:00
parent cb6805a852
commit 7dbf748078
10 changed files with 761 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/game/malloc.c
View file

@ -1,8 +1,8 @@
#include "common.h"
#include "dolphin/os.h"
static u32 HeapSizeTbl[5] = { 0x240000, 0x140000, 0xA80000, 0x580000, 0 };
static void *HeapTbl[5];
static u32 HeapSizeTbl[HEAP_MAX] = { 0x240000, 0x140000, 0xA80000, 0x580000, 0 };
static void *HeapTbl[HEAP_MAX];
void HuMemInitAll(void)
{
@ -39,12 +39,12 @@ void HuMemDCFlushAll()
HuMemDCFlush(0);
}
void HuMemDCFlush(int heap)
void HuMemDCFlush(HeapID heap)
{
DCFlushRangeNoSync(HeapTbl[heap], HeapSizeTbl[heap]);
}
void *HuMemDirectMalloc(int heap, s32 size)
void *HuMemDirectMalloc(HeapID heap, s32 size)
{
register u32 retaddr;
asm {
@ -54,7 +54,7 @@ void *HuMemDirectMalloc(int heap, s32 size)
return HuMemMemoryAlloc(HeapTbl[heap], size, retaddr);
}
void *HuMemDirectMallocNum(int heap, s32 size, u32 num)
void *HuMemDirectMallocNum(HeapID heap, s32 size, u32 num)
{
register u32 retaddr;
asm {
@ -73,7 +73,7 @@ void HuMemDirectFree(void *ptr)
HuMemMemoryFree(ptr, retaddr);
}
void HuMemDirectFreeNum(int heap, u32 num)
void HuMemDirectFreeNum(HeapID heap, u32 num)
{
register u32 retaddr;
asm {
@ -82,22 +82,22 @@ void HuMemDirectFreeNum(int heap, u32 num)
HuMemMemoryFreeNum(HeapTbl[heap], num, retaddr);
}
s32 HuMemUsedMallocSizeGet(int heap)
s32 HuMemUsedMallocSizeGet(HeapID heap)
{
return HuMemUsedMemorySizeGet(HeapTbl[heap]);
}
s32 HuMemUsedMallocBlockGet(int heap)
s32 HuMemUsedMallocBlockGet(HeapID heap)
{
return HuMemUsedMemoryBlockGet(HeapTbl[heap]);
}
u32 HuMemHeapSizeGet(int heap)
u32 HuMemHeapSizeGet(HeapID heap)
{
return HeapSizeTbl[heap];
}
void *HuMemHeapPtrGet(int heap)
void *HuMemHeapPtrGet(HeapID heap)
{
return HeapTbl[heap];
}