mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-18 15:35:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_heap OK (#47)

Browse Source 
* d_heap OK

* wibo workaround
This commit is contained in:
robojumper
2024-10-01 14:48:49 +02:00
committed by GitHub
parent 4d9806f2fc
commit d75f4c92ef
5 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_heap_alloc.h
+8 -16
View File
@@ -12,21 +12,13 @@ public:
inline void doInitCallbacks() {
if (!mCallbacksInitialized) {
mCallbacksInitialized = 1;
EGG::Heap::AllocCallbackBundle prev = EGG::Heap::setAllocCallback(&allocCallback, this);
mPreviousAllocCallback = prev.AllocCallback;
mPreviousAllocCallbackArg = prev.AllocCallbackArg;
void *oldAllocCallbackArg = EGG::Heap::sAllocCallbackArg;
void *oldFreeCallbackArg = EGG::Heap::sFreeCallbackArg;
EGG::HeapAllocCallback oldAllocCallback = EGG::Heap::sAllocCallback;
EGG::HeapFreeCallback oldFreeCallback = EGG::Heap::sFreeCallback;
EGG::Heap::sAllocCallback = &allocCallback;
EGG::Heap::sAllocCallbackArg = this;
mPreviousAllocCallback = oldAllocCallback;
mPreviousAllocCallbackArg = oldAllocCallbackArg;
EGG::Heap::sFreeCallback = &freeCallback;
EGG::Heap::sFreeCallbackArg = this;
mPreviousFreeCallback = oldFreeCallback;
mPreviousFreeCallbackArg = oldFreeCallbackArg;
EGG::Heap::FreeCallbackBundle prev2 = EGG::Heap::setFreeCallback(&freeCallback, this);
mPreviousFreeCallback = prev2.FreeCallback;
mPreviousFreeCallbackArg = prev2.FreeCallbackArg;
}
}
static void allocCallback(EGG::HeapAllocArg *arg) {
@@ -50,8 +42,8 @@ public:
}
virtual ~dHeapAllocatorBase() {}
virtual void onAlloc(EGG::HeapAllocArg *arg){};
virtual void onFree(EGG::HeapFreeArg *arg){};
virtual void onAlloc(EGG::HeapAllocArg *arg) {};
virtual void onFree(EGG::HeapFreeArg *arg) {};
/* 0x04 */ bool mCallbacksInitialized;
/* 0x08 */ EGG::HeapAllocCallback mPreviousAllocCallback;
include/egg/core/eggHeap.h
+32
View File
@@ -145,6 +145,38 @@ public:
return mName;
}
struct AllocCallbackBundle {
HeapAllocCallback AllocCallback;
void *AllocCallbackArg;
};
struct FreeCallbackBundle {
HeapFreeCallback FreeCallback;
void *FreeCallbackArg;
};
static inline AllocCallbackBundle setAllocCallback(HeapAllocCallback AllocCallback, void *AllocCallbackArg) {
AllocCallbackBundle ret;
ret.AllocCallback = sAllocCallback;
ret.AllocCallbackArg = sAllocCallbackArg;
sAllocCallback = AllocCallback;
sAllocCallbackArg = AllocCallbackArg;
return ret;
}
static inline FreeCallbackBundle setFreeCallback(HeapFreeCallback FreeCallback, void *FreeCallbackArg) {
FreeCallbackBundle ret;
ret.FreeCallback = sFreeCallback;
ret.FreeCallbackArg = sFreeCallbackArg;
sFreeCallback = FreeCallback;
sFreeCallbackArg = FreeCallbackArg;
return ret;
}
/* 80673ae8 */ static nw4r::ut::List sHeapList;
/* 80673af8 */ static OSMutex sRootMutex;
/* 80576740 */ static Heap *sCurrentHeap;