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

Replace the Spinlock with a Mutex, flush the heap header

Browse Source
This commit is contained in:
Maschell 2021-10-20 23:52:09 +02:00
parent 2b68e73d9c
commit 60d000a277
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/memory_mapping.cpp
View File

@ -11,9 +11,11 @@
#include "CThread.h" #include "CThread.h"
#include <cstring> #include <cstring>
#include <coreinit/debug.h> #include <coreinit/debug.h>
#include <coreinit/mutex.h>
#include <cstdio> #include <cstdio>
OSSpinLock allocFreeSpinlock; OSMutex allocFreeMutex;
// #define DEBUG_FUNCTION_LINE(x,...) // #define DEBUG_FUNCTION_LINE(x,...)
@ -382,10 +384,11 @@ void MemoryMapping_setupMemoryMapping() {
//readTestValuesFromMemory(); //readTestValuesFromMemory();
//runOnAllCores(writeSegmentRegister,&srTableCpy); //runOnAllCores(writeSegmentRegister,&srTableCpy);
OSInitMutex(&allocFreeMutex);
} }
void *MemoryMapping_allocEx(uint32_t size, int32_t align, bool videoOnly) { void *MemoryMapping_allocEx(uint32_t size, int32_t align, bool videoOnly) {
OSUninterruptibleSpinLock_Acquire(&allocFreeSpinlock); OSLockMutex(&allocFreeMutex);
void *res = nullptr; void *res = nullptr;
for (int32_t i = 0; /* waiting for a break */; i++) { for (int32_t i = 0; /* waiting for a break */; i++) {
if (mem_mapping[i].physical_addresses == nullptr) { if (mem_mapping[i].physical_addresses == nullptr) {
@ -400,6 +403,8 @@ void *MemoryMapping_allocEx(uint32_t size, int32_t align, bool videoOnly) {
continue; continue;
} }
DCFlushRange(heap, sizeof(MEMExpHeap));
res = MEMAllocFromExpHeapEx(heapHandle, size, align); res = MEMAllocFromExpHeapEx(heapHandle, size, align);
auto cur = heap->usedList.head; auto cur = heap->usedList.head;
while (cur != nullptr) { while (cur != nullptr) {
@ -415,7 +420,7 @@ void *MemoryMapping_allocEx(uint32_t size, int32_t align, bool videoOnly) {
break; break;
} }
} }
OSUninterruptibleSpinLock_Release(&allocFreeSpinlock); OSUnlockMutex(&allocFreeMutex);
return res; return res;
} }
@ -431,7 +436,7 @@ void MemoryMapping_free(void *ptr) {
if (ptr == nullptr) { if (ptr == nullptr) {
return; return;
} }
OSUninterruptibleSpinLock_Acquire(&allocFreeSpinlock); OSLockMutex(&allocFreeMutex);
auto ptr_val = (uint32_t) ptr; auto ptr_val = (uint32_t) ptr;
for (int32_t i = 0; /* waiting for a break */; i++) { for (int32_t i = 0; /* waiting for a break */; i++) {
if (mem_mapping[i].physical_addresses == nullptr) { if (mem_mapping[i].physical_addresses == nullptr) {
@ -442,6 +447,7 @@ void MemoryMapping_free(void *ptr) {
auto *heap = (MEMExpHeap *) heapHandle; auto *heap = (MEMExpHeap *) heapHandle;
MEMFreeToExpHeap((MEMHeapHandle) mem_mapping[i].effective_start_address, ptr); MEMFreeToExpHeap((MEMHeapHandle) mem_mapping[i].effective_start_address, ptr);
DCFlushRange(heap, sizeof(MEMExpHeap));
auto cur = heap->usedList.head; auto cur = heap->usedList.head;
while (cur != nullptr) { while (cur != nullptr) {
DCFlushRange(cur, sizeof(MEMExpHeapBlock)); DCFlushRange(cur, sizeof(MEMExpHeapBlock));
@ -455,7 +461,7 @@ void MemoryMapping_free(void *ptr) {
break; break;
} }
} }
OSUninterruptibleSpinLock_Release(&allocFreeSpinlock); OSUnlockMutex(&allocFreeMutex);
} }
uint32_t MemoryMapping_MEMGetAllocatableSize() { uint32_t MemoryMapping_MEMGetAllocatableSize() {