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

Change some size_t usage to uintptr_t

Browse source
This commit is contained in:
dbalatoni13 2025-04-03 23:35:53 +02:00
parent 8000ff491a
commit 30d80d66a0
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/dolphin/types.h
View file

@ -22,6 +22,7 @@ typedef unsigned long u32;
typedef unsigned long long int u64; typedef unsigned long long int u64;
typedef u32 size_t; typedef u32 size_t;
typedef u32 uintptr_t;
#endif #endif
typedef volatile u8 vu8; typedef volatile u8 vu8;

8
include/game/memory.h
View file

@ -28,10 +28,10 @@ u32 HuMemHeapSizeGet(HeapID heap);
void *HuMemHeapPtrGet(HeapID heap); void *HuMemHeapPtrGet(HeapID heap);
void *HuMemHeapInit(void *ptr, s32 size); void *HuMemHeapInit(void *ptr, s32 size);
void *HuMemMemoryAlloc(void *heap_ptr, s32 size, size_t retaddr); void *HuMemMemoryAlloc(void *heap_ptr, s32 size, uintptr_t retaddr);
void *HuMemMemoryAllocNum(void *heap_ptr, s32 size, u32 num, size_t retaddr); void *HuMemMemoryAllocNum(void *heap_ptr, s32 size, u32 num, uintptr_t retaddr);
void HuMemMemoryFree(void *ptr, size_t retaddr); void HuMemMemoryFree(void *ptr, uintptr_t retaddr);
void HuMemMemoryFreeNum(void *heap_ptr, u32 num, size_t retaddr); void HuMemMemoryFreeNum(void *heap_ptr, u32 num, uintptr_t retaddr);
s32 HuMemUsedMemorySizeGet(void *heap_ptr); s32 HuMemUsedMemorySizeGet(void *heap_ptr);
s32 HuMemUsedMemoryBlockGet(void *heap_ptr); s32 HuMemUsedMemoryBlockGet(void *heap_ptr);
s32 HuMemMemorySizeGet(void *ptr); s32 HuMemMemorySizeGet(void *ptr);

14
src/game/memory.c
View file

@ -13,10 +13,10 @@ struct memory_block {
struct memory_block *prev; struct memory_block *prev;
struct memory_block *next; struct memory_block *next;
u32 num; u32 num;
size_t retaddr; uintptr_t retaddr;
}; };
static void *HuMemMemoryAlloc2(void *heap_ptr, s32 size, u32 num, size_t retaddr); static void *HuMemMemoryAlloc2(void *heap_ptr, s32 size, u32 num, uintptr_t retaddr);
void *HuMemHeapInit(void *ptr, s32 size) void *HuMemHeapInit(void *ptr, s32 size)
{ {
@ -31,17 +31,17 @@ void *HuMemHeapInit(void *ptr, s32 size)
return block; return block;
} }
void *HuMemMemoryAllocNum(void *heap_ptr, s32 size, u32 num, size_t retaddr) void *HuMemMemoryAllocNum(void *heap_ptr, s32 size, u32 num, uintptr_t retaddr)
{ {
return HuMemMemoryAlloc2(heap_ptr, size, num, retaddr); return HuMemMemoryAlloc2(heap_ptr, size, num, retaddr);
} }
void *HuMemMemoryAlloc(void *heap_ptr, s32 size, size_t retaddr) void *HuMemMemoryAlloc(void *heap_ptr, s32 size, uintptr_t retaddr)
{ {
return HuMemMemoryAlloc2(heap_ptr, size, -256, retaddr); return HuMemMemoryAlloc2(heap_ptr, size, -256, retaddr);
} }
static void *HuMemMemoryAlloc2(void *heap_ptr, s32 size, u32 num, size_t retaddr) static void *HuMemMemoryAlloc2(void *heap_ptr, s32 size, u32 num, uintptr_t retaddr)
{ {
s32 alloc_size = MEM_ALLOC_SIZE(size); s32 alloc_size = MEM_ALLOC_SIZE(size);
struct memory_block *block = heap_ptr; struct memory_block *block = heap_ptr;
@ -72,7 +72,7 @@ static void *HuMemMemoryAlloc2(void *heap_ptr, s32 size, u32 num, size_t retaddr
return NULL; return NULL;
} }
void HuMemMemoryFreeNum(void *heap_ptr, u32 num, size_t retaddr) void HuMemMemoryFreeNum(void *heap_ptr, u32 num, uintptr_t retaddr)
{ {
struct memory_block *block = heap_ptr; struct memory_block *block = heap_ptr;
do { do {
@ -90,7 +90,7 @@ static void HuMemTailMemoryAlloc2() //Required for string literal
OSReport("memory allocation(tail) error.\n"); OSReport("memory allocation(tail) error.\n");
} }
void HuMemMemoryFree(void *ptr, size_t retaddr) void HuMemMemoryFree(void *ptr, uintptr_t retaddr)
{ {
struct memory_block *block; struct memory_block *block;
if(!ptr) { if(!ptr) {