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

Trust in CafeOS to figure it out

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

13
source/memory_mapping.cpp
View File

@ -11,8 +11,6 @@
#include "CThread.h" #include "CThread.h"
#include <cstring> #include <cstring>
OSSpinLock allocFreeSpinlock;
// #define DEBUG_FUNCTION_LINE(x,...) // #define DEBUG_FUNCTION_LINE(x,...)
void runOnAllCores(CThread::Callback callback, void *callbackArg, int32_t iAttr = 0, int32_t iPriority = 16, int32_t iStackSize = 0x8000) { void runOnAllCores(CThread::Callback callback, void *callbackArg, int32_t iAttr = 0, int32_t iPriority = 16, int32_t iStackSize = 0x8000) {
@ -380,12 +378,9 @@ void MemoryMapping_setupMemoryMapping() {
//readTestValuesFromMemory(); //readTestValuesFromMemory();
//runOnAllCores(writeSegmentRegister,&srTableCpy); //runOnAllCores(writeSegmentRegister,&srTableCpy);
OSInitSpinLock(&allocFreeSpinlock);
} }
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);
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) {
@ -401,12 +396,10 @@ void *MemoryMapping_allocEx(uint32_t size, int32_t align, bool videoOnly) {
} }
res = MEMAllocFromExpHeapEx(heapHandle, size, align); res = MEMAllocFromExpHeapEx(heapHandle, size, align);
auto cur = heap->usedList.head;
if (res != nullptr) { if (res != nullptr) {
break; break;
} }
} }
OSUninterruptibleSpinLock_Release(&allocFreeSpinlock);
return res; return res;
} }
@ -422,7 +415,6 @@ void MemoryMapping_free(void *ptr) {
if (ptr == nullptr) { if (ptr == nullptr) {
return; return;
} }
OSUninterruptibleSpinLock_Acquire(&allocFreeSpinlock);
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) {
@ -437,7 +429,6 @@ void MemoryMapping_free(void *ptr) {
break; break;
} }
} }
OSUninterruptibleSpinLock_Release(&allocFreeSpinlock);
} }
uint32_t MemoryMapping_MEMGetAllocatableSize() { uint32_t MemoryMapping_MEMGetAllocatableSize() {
@ -481,8 +472,8 @@ void MemoryMapping_CreateHeaps() {
uint32_t size = mem_mapping[i].effective_end_address - mem_mapping[i].effective_start_address; uint32_t size = mem_mapping[i].effective_end_address - mem_mapping[i].effective_start_address;
memset(reinterpret_cast<void *>(mem_mapping[i].effective_start_address), 0, size); memset(reinterpret_cast<void *>(mem_mapping[i].effective_start_address), 0, size);
MEMCreateExpHeapEx(address, size, MEM_HEAP_FLAG_USE_LOCK); auto heap = MEMCreateExpHeapEx(address, size, MEM_HEAP_FLAG_USE_LOCK);
DEBUG_FUNCTION_LINE_VERBOSE("Created heap @%08X, size %d KiB", address, size / 1024); DEBUG_FUNCTION_LINE("Created heap @%08X, size %d KiB", heap, size / 1024);
} }
} }