From 02607a457168ed8a2f02bc6f562c2395aa1c4203 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Tue, 24 Feb 2026 23:20:11 +0100 Subject: [PATCH] Minor JKRSolidHeap fixes (#3109) 64-bit compat --- src/JSystem/JKernel/JKRSolidHeap.cpp | 8 ++++---- 1 file 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;