The-Homebrew-Cloud/MemoryMappingModule
2
0
Fork 0
mirror of https://github.com/wiiu-env/MemoryMappingModule.git synced 2024-11-25 19:26:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

The allocated size is now always an integral multiple of alignment.

Browse Source
This commit is contained in:
Maschell 2022-02-12 20:11:54 +01:00
parent f513e1a374
commit 79787e7dce
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/memory_mapping.cpp
View File

@ -395,9 +395,6 @@ void MemoryMapping_setupMemoryMapping() {
OSInitMutex(&allocMutex); OSInitMutex(&allocMutex);
} }
#define ROUNDDOWN(val, align) ((val) & ~(align - 1))
#define ROUNDUP(val, align) ROUNDDOWN(((val) + (align - 1)), align)
void *MemoryMapping_allocEx(uint32_t size, int32_t align, bool videoOnly) { void *MemoryMapping_allocEx(uint32_t size, int32_t align, bool videoOnly) {
OSLockMutex(&allocMutex); OSLockMutex(&allocMutex);
void *res = nullptr; void *res = nullptr;
@ -414,10 +411,7 @@ void *MemoryMapping_allocEx(uint32_t size, int32_t align, bool videoOnly) {
continue; continue;
} }
// We round up the size to avoid heap corruption. res = MEMAllocFromExpHeapEx(heapHandle, (size + align - 1) & ~(align - 1), align);
// FSReadFile expects the buffer size to be a multiple of 0x40
// This can remove once all modules/plugins have been updated :)
res = MEMAllocFromExpHeapEx(heapHandle, ROUNDUP(size, 0x40), align);
if (res != nullptr) { if (res != nullptr) {
break; break;
} }