mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 20:43:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Isolate JKRHeap operator overloads

Browse Source 
Fixes #25

This isolates the JKRHeap operator new/delete overloads. Every single new/delete site in the code has been replaced with a macro.

Sadly for new[] and delete[] we have to keep global operators. The global new[] just allocates into malloc() however, and delete[] goes into free() if it's not in a JKRHeap. So that's fine.
This commit is contained in:
PJB3005
2026-02-27 23:11:59 +01:00
parent f59295c127
commit 0ee3b2b197
634 changed files with 3451 additions and 3350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_meter_HIO.cpp
+8 -8
View File
@@ -3498,11 +3498,11 @@ BOOL subJOREventCallbackListNode::JORAct(u32 param_1, const char* param_2) {
file.close();
if (g_fmapHIO.mpArcData) {
JKRUnmountArchive(g_fmapHIO.mpArcData);
delete g_fmapHIO.mpArcData;
JKR_DELETE(g_fmapHIO.mpArcData);
g_fmapHIO.mpArcData = NULL;
}
JKRDecompress((u8*)g_fmapHIO.mpArcFile, (u8*)g_fmapHIO.mpDecompBuf, 0x46000, 0);
g_fmapHIO.mpArcData = new(mDoExt_getArchiveHeap(), 0) JKRMemArchive(g_fmapHIO.mpDecompBuf, 0x46000, JKRMEMBREAK_FLAG_UNKNOWN0);
g_fmapHIO.mpArcData = JKR_NEW_ARGS(mDoExt_getArchiveHeap(), 0) JKRMemArchive(g_fmapHIO.mpDecompBuf, 0x46000, JKRMEMBREAK_FLAG_UNKNOWN0);
JUT_ASSERT(6413, g_fmapHIO.mpArcData != NULL);
if (dComIfGp_isHeapLockFlag() == 2) {
g_fmapHIO.field_0x2f9 = true;
@@ -3951,13 +3951,13 @@ dMeter_fmapHIO_c::~dMeter_fmapHIO_c() {
if (mpArcData != NULL) {
JKRUnmountArchive(mpArcData);
delete mpArcData;
JKR_DELETE(mpArcData);
mpArcData = NULL;
}
#if DEBUG
if (mpEvtCallBack != NULL) {
delete mpEvtCallBack;
JKR_DELETE(mpEvtCallBack);
mpEvtCallBack = NULL;
}
#endif
@@ -4194,11 +4194,11 @@ void dMeter_fmapHIO_c::listenPropertyEvent(const JORPropertyEvent* property) {
file.close();
if (mpArcData) {
JKRUnmountArchive(mpArcData);
delete mpArcData;
JKR_DELETE(mpArcData);
mpArcData = NULL;
}
JKRDecompress((u8*)mpArcFile, (u8*)mpDecompBuf, 0x46000, 0);
mpArcData = new(mDoExt_getArchiveHeap(), 0) JKRMemArchive(mpDecompBuf, 0x46000, JKRMEMBREAK_FLAG_UNKNOWN0);
mpArcData = JKR_NEW_ARGS(mDoExt_getArchiveHeap(), 0) JKRMemArchive(mpDecompBuf, 0x46000, JKRMEMBREAK_FLAG_UNKNOWN0);
JUT_ASSERT(7429, mpArcData != NULL);
if (dComIfGp_isHeapLockFlag() == 2) {
field_0x2f9 = true;
@@ -4221,13 +4221,13 @@ void dMeter_fmapHIO_c::createEvtCallBackObject() {
if (mpEvtCallBack) {
return;
}
mpEvtCallBack = new subJOREventCallbackListNode();
mpEvtCallBack = JKR_NEW subJOREventCallbackListNode();
JUT_ASSERT(7460, mpEvtCallBack != NULL)
}
void dMeter_fmapHIO_c::deleteEvtCallBackObject() {
if (mpEvtCallBack) {
delete mpEvtCallBack;
JKR_DELETE(mpEvtCallBack);
mpEvtCallBack = NULL;
}
}