mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-22 22:44:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor JKRSolidHeap fixes (#3109)

Browse Source 
64-bit compat
This commit is contained in:
Pieter-Jan Briers
2026-02-24 23:20:11 +01:00
committed by GitHub
parent 96ffd91c9a
commit 02607a4571
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JKernel/JKRSolidHeap.cpp
+4 -4
View File
@@ -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;