diff options
| author | Pieter-Jan Briers <pieterjan.briers+git@gmail.com> | 2026-04-11 08:42:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-04-10 23:42:00 -0700 |
| commit | dabd6961a674f23ec0df8f2b4d16ba12e1e090e5 (patch) | |
| tree | 573d319da2c7316e5f95f7c095553446931070df | |
| parent | bcd5a9639182af3658f5e6333dcca3288642fc8f (diff) | |
Couple sizeof(CMemBlock)s (#3143)
| -rw-r--r-- | libs/JSystem/include/JSystem/JKernel/JKRExpHeap.h | 2 | ||||
| -rw-r--r-- | libs/JSystem/src/JKernel/JKRExpHeap.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/JSystem/include/JSystem/JKernel/JKRExpHeap.h b/libs/JSystem/include/JSystem/JKernel/JKRExpHeap.h index 1535ba757b..cf6bb819eb 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRExpHeap.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRExpHeap.h @@ -35,7 +35,7 @@ public: CMemBlock* getNextBlock() const { return mNext; } u32 getSize() const { return size; } u8 getGroupId() const { return mGroupId; } - static CMemBlock* getBlock(void* data) { return (CMemBlock*)((uintptr_t)data + -0x10); } + static CMemBlock* getBlock(void* data) { return (CMemBlock*)((uintptr_t)data + -sizeof(CMemBlock)); } private: /* 0x0 */ u16 mMagic; diff --git a/libs/JSystem/src/JKernel/JKRExpHeap.cpp b/libs/JSystem/src/JKernel/JKRExpHeap.cpp index 1c6d16c1a9..1f570dd421 100644 --- a/libs/JSystem/src/JKernel/JKRExpHeap.cpp +++ b/libs/JSystem/src/JKernel/JKRExpHeap.cpp @@ -464,7 +464,7 @@ void JKRExpHeap::do_freeAll() { JKRHeap::callAllDisposer(); mHeadFreeList = (CMemBlock*)mStart; mTailFreeList = mHeadFreeList; - mHeadFreeList->initiate(NULL, NULL, mSize - 0x10, 0, 0); + mHeadFreeList->initiate(NULL, NULL, mSize - sizeof(CMemBlock), 0, 0); mHeadUsedList = NULL; mTailUsedList = NULL; #if DEBUG |