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

Fix types and aarch

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

4
include/game/jmp.h
View file

@ -76,7 +76,7 @@ typedef struct _JUMP_BUFFER {
uint32_t Fpscr; uint32_t Fpscr;
uint32_t long D[8]; // D8-D15 VFP/NEON regs uint32_t long D[8]; // D8-D15 VFP/NEON regs
} _JUMP_BUFFER; } _JUMP_BUFFER;
#elif defined(_M_ARM64) || defined(__arch64__) #elif defined(_M_ARM64) || defined(__aarch64__)
typedef struct _JUMP_BUFFER { typedef struct _JUMP_BUFFER {
uint64_t Frame; uint64_t Frame;
uint64_t Reserved; uint64_t Reserved;
@ -139,7 +139,7 @@ typedef struct _JUMP_BUFFER {
#elif defined(_M_ARM) || defined(__arm__) #elif defined(_M_ARM) || defined(__arm__)
#define SETJMP_SET_IP(jump, func) ((_JUMP_BUFFER *)((jump)))->Pc = (size_t)func #define SETJMP_SET_IP(jump, func) ((_JUMP_BUFFER *)((jump)))->Pc = (size_t)func
#define SETJMP_SET_SP(jump, sp) ((_JUMP_BUFFER *)((jump)))->Sp = (size_t)sp #define SETJMP_SET_SP(jump, sp) ((_JUMP_BUFFER *)((jump)))->Sp = (size_t)sp
#elif defined(_M_ARM64) || defined(__arch64__) #elif defined(_M_ARM64) || defined(__aarch64__)
#define SETJMP_SET_IP(jump, func) ((_JUMP_BUFFER *)((jump)))->Lr = (size_t)func #define SETJMP_SET_IP(jump, func) ((_JUMP_BUFFER *)((jump)))->Lr = (size_t)func
#define SETJMP_SET_SP(jump, sp) ((_JUMP_BUFFER *)((jump)))->Sp = (size_t)sp #define SETJMP_SET_SP(jump, sp) ((_JUMP_BUFFER *)((jump)))->Sp = (size_t)sp
#elif defined(__riscv) #elif defined(__riscv)

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, u32 retaddr); void *HuMemMemoryAlloc(void *heap_ptr, s32 size, size_t retaddr);
void *HuMemMemoryAllocNum(void *heap_ptr, s32 size, u32 num, u32 retaddr); void *HuMemMemoryAllocNum(void *heap_ptr, s32 size, u32 num, size_t retaddr);
void HuMemMemoryFree(void *ptr, u32 retaddr); void HuMemMemoryFree(void *ptr, size_t retaddr);
void HuMemMemoryFreeNum(void *heap_ptr, u32 num, u32 retaddr); void HuMemMemoryFreeNum(void *heap_ptr, u32 num, size_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);

4
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;
u32 retaddr; size_t retaddr;
}; };
static void *HuMemMemoryAlloc2(void *heap_ptr, s32 size, u32 num, u32 retaddr); static void *HuMemMemoryAlloc2(void *heap_ptr, s32 size, u32 num, size_t retaddr);
void *HuMemHeapInit(void *ptr, s32 size) void *HuMemHeapInit(void *ptr, s32 size)
{ {