mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-09-07 11:01:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into pr/27

Browse Source
This commit is contained in:
elijah-thomas774
2024-05-05 12:29:33 -04:00
parent af59a51db3 00f2cf933c
commit fe466805ab
5 changed files with 161 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/egg/core/eggHeap.h
+11 -10
View File
@@ -17,14 +17,15 @@ namespace EGG {
class Allocator;
struct HeapAllocArg {
int userArg; // 00
u32 size; // 04
int align; // 08
Heap *heap; // 0C heap to allocate in
void *userArg; // 00
u32 size; // 04
int align; // 08
Heap *heap; // 0C heap to allocate in
int another; // 10
inline HeapAllocArg() : userArg(0), size(0), align(0), heap(nullptr) {}
};
typedef void (*HeapAllocCallback)(HeapAllocArg &arg);
typedef void (*HeapAllocCallback)(HeapAllocArg *arg);
struct HeapErrorArg {
const char *msg;
@@ -32,13 +33,14 @@ struct HeapErrorArg {
inline HeapErrorArg() {}
};
typedef void (*ErrorCallback)(void *);
typedef void (*ErrorCallback)(HeapErrorArg *);
struct HeapFreeArg {
u32 arg1; // Idk the args
u32 arg2;
void *userArg;
int arg1;
int arg2;
};
typedef void (*HeapFreeCallback)(void *);
typedef void (*HeapFreeCallback)(HeapFreeArg *);
typedef void (*HeapCreateCallback)(void *);
typedef void (*HeapDestroyCallback)(void *);
@@ -157,7 +159,6 @@ public:
/* 80576764 */ static HeapCreateCallback sCreateCallback;
/* 80576764 */ static HeapDestroyCallback sDestroyCallback;
};
} // namespace EGG
/* 80495a60 */ void *operator new(size_t, void *p);