summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPieter-Jan Briers <pieterjan.briers+git@gmail.com>2026-02-24 23:20:11 +0100
committerGitHub <noreply@github.com>2026-02-24 14:20:11 -0800
commit02607a457168ed8a2f02bc6f562c2395aa1c4203 (patch)
tree480a2aafac3e0838e325d01aa4bc61e43328a448 /src
parent96ffd91c9a2cd145c0a40fb05de47af695fa6ffb (diff)
Minor JKRSolidHeap fixes (#3109)
64-bit compat
Diffstat (limited to 'src')
-rw-r--r--src/JSystem/JKernel/JKRSolidHeap.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp
index 01ead7728b..a12cb8835a 100644
--- a/src/JSystem/JKernel/JKRSolidHeap.cpp
+++ b/src/JSystem/JKernel/JKRSolidHeap.cpp
@@ -106,9 +106,9 @@ void* JKRSolidHeap::do_alloc(u32 size, int alignment) {
}
void* JKRSolidHeap::allocFromHead(u32 size, int alignment) {
- size = ALIGN_NEXT(size, 0x4);
+ size = ALIGN_NEXT(size, sizeof(void*));
void* ptr = NULL;
- u32 alignedStart = (alignment - 1 + (uintptr_t)mSolidHead) & ~(alignment - 1);
+ uintptr_t alignedStart = (alignment - 1 + (uintptr_t)mSolidHead) & ~(alignment - 1);
u32 totalSize = size + (alignedStart - (uintptr_t)mSolidHead);
if (totalSize <= mFreeSize) {
#if DEBUG
@@ -133,9 +133,9 @@ void* JKRSolidHeap::allocFromHead(u32 size, int alignment) {
}
void* JKRSolidHeap::allocFromTail(u32 size, int alignment) {
- size = ALIGN_NEXT(size, 4);
+ size = ALIGN_NEXT(size, sizeof(void*));
void* ptr = NULL;
- u32 alignedStart = ALIGN_PREV((uintptr_t)mSolidTail - size, alignment);
+ uintptr_t alignedStart = ALIGN_PREV((uintptr_t)mSolidTail - size, alignment);
u32 totalSize = (uintptr_t)mSolidTail - (uintptr_t)alignedStart;
if (totalSize <= mFreeSize) {
ptr = (void*)alignedStart;