mirror of
https://github.com/wiiu-env/MemoryMappingModule.git
synced 2026-03-23 10:24:16 -05:00
Compare commits
2 Commits
MemoryMapp
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d8ce4bc7e6 | ||
|
|
86c1d20863 |
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ghcr.io/wiiu-env/devkitppc:20240423
|
FROM ghcr.io/wiiu-env/devkitppc:20240505
|
||||||
|
|
||||||
COPY --from=ghcr.io/wiiu-env/libkernel:20230621 /artifacts $DEVKITPRO
|
COPY --from=ghcr.io/wiiu-env/libkernel:20230621 /artifacts $DEVKITPRO
|
||||||
COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
|
COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
// #define DEBUG_FUNCTION_LINE(x,...)
|
// #define DEBUG_FUNCTION_LINE(x,...)
|
||||||
|
|
||||||
OSMutex allocMutex;
|
//OSMutex allocMutex;
|
||||||
|
|
||||||
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) {
|
||||||
int32_t aff[] = {CThread::eAttributeAffCore2, CThread::eAttributeAffCore1, CThread::eAttributeAffCore0};
|
int32_t aff[] = {CThread::eAttributeAffCore2, CThread::eAttributeAffCore1, CThread::eAttributeAffCore0};
|
||||||
|
|
@ -552,14 +552,14 @@ void MemoryMapping_setupMemoryMapping() {
|
||||||
//readTestValuesFromMemory();
|
//readTestValuesFromMemory();
|
||||||
|
|
||||||
//runOnAllCores(writeSegmentRegister,&srTableCpy);
|
//runOnAllCores(writeSegmentRegister,&srTableCpy);
|
||||||
OSInitMutex(&allocMutex);
|
// OSInitMutex(&allocMutex);
|
||||||
|
|
||||||
memset(pageTableCpy, 0, sizePageTable);
|
memset(pageTableCpy, 0, sizePageTable);
|
||||||
gMEMFreeToDefaultHeapForThreads(pageTableCpy);
|
gMEMFreeToDefaultHeapForThreads(pageTableCpy);
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
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) {
|
||||||
|
|
@ -587,7 +587,7 @@ void *MemoryMapping_allocEx(uint32_t size, int32_t align, bool videoOnly) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
OSMemoryBarrier();
|
OSMemoryBarrier();
|
||||||
OSUnlockMutex(&allocMutex);
|
//OSUnlockMutex(&allocMutex);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -659,7 +659,7 @@ bool CheckMemExpHeap(MEMExpHeap *heap) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void MemoryMapping_checkHeaps() {
|
void MemoryMapping_checkHeaps() {
|
||||||
OSLockMutex(&allocMutex);
|
//OSLockMutex(&allocMutex);
|
||||||
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) {
|
||||||
break;
|
break;
|
||||||
|
|
@ -672,7 +672,7 @@ void MemoryMapping_checkHeaps() {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
OSUnlockMutex(&allocMutex);
|
//OSUnlockMutex(&allocMutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
void *MemoryMapping_alloc(uint32_t size, int32_t align) {
|
void *MemoryMapping_alloc(uint32_t size, int32_t align) {
|
||||||
|
|
@ -710,7 +710,7 @@ void MemoryMapping_free(void *ptr) {
|
||||||
if (ptr == nullptr) {
|
if (ptr == nullptr) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
OSLockMutex(&allocMutex);
|
//OSLockMutex(&allocMutex);
|
||||||
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) {
|
||||||
|
|
@ -723,7 +723,7 @@ void MemoryMapping_free(void *ptr) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
OSMemoryBarrier();
|
OSMemoryBarrier();
|
||||||
OSUnlockMutex(&allocMutex);
|
//OSUnlockMutex(&allocMutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t MemoryMapping_MEMGetAllocatableSize() {
|
uint32_t MemoryMapping_MEMGetAllocatableSize() {
|
||||||
|
|
@ -731,7 +731,7 @@ uint32_t MemoryMapping_MEMGetAllocatableSize() {
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t MemoryMapping_MEMGetAllocatableSizeEx(uint32_t align) {
|
uint32_t MemoryMapping_MEMGetAllocatableSizeEx(uint32_t align) {
|
||||||
OSLockMutex(&allocMutex);
|
//OSLockMutex(&allocMutex);
|
||||||
uint32_t res = 0;
|
uint32_t res = 0;
|
||||||
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) {
|
||||||
|
|
@ -743,12 +743,12 @@ uint32_t MemoryMapping_MEMGetAllocatableSizeEx(uint32_t align) {
|
||||||
res = curRes;
|
res = curRes;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
OSUnlockMutex(&allocMutex);
|
//OSUnlockMutex(&allocMutex);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t MemoryMapping_GetFreeSpace() {
|
uint32_t MemoryMapping_GetFreeSpace() {
|
||||||
OSLockMutex(&allocMutex);
|
//OSLockMutex(&allocMutex);
|
||||||
uint32_t res = 0;
|
uint32_t res = 0;
|
||||||
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) {
|
||||||
|
|
@ -758,12 +758,12 @@ uint32_t MemoryMapping_GetFreeSpace() {
|
||||||
DEBUG_FUNCTION_LINE_VERBOSE("heap at %08X MEMGetTotalFreeSizeForExpHeap: %d KiB", mem_mapping[i].effective_start_address, curRes / 1024);
|
DEBUG_FUNCTION_LINE_VERBOSE("heap at %08X MEMGetTotalFreeSizeForExpHeap: %d KiB", mem_mapping[i].effective_start_address, curRes / 1024);
|
||||||
res += curRes;
|
res += curRes;
|
||||||
}
|
}
|
||||||
OSUnlockMutex(&allocMutex);
|
//OSUnlockMutex(&allocMutex);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MemoryMapping_CreateHeaps() {
|
void MemoryMapping_CreateHeaps() {
|
||||||
OSLockMutex(&allocMutex);
|
//OSLockMutex(&allocMutex);
|
||||||
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) {
|
||||||
break;
|
break;
|
||||||
|
|
@ -780,11 +780,11 @@ void MemoryMapping_CreateHeaps() {
|
||||||
DEBUG_FUNCTION_LINE("Created heap @%08X, size %d KiB", heap, size / 1024);
|
DEBUG_FUNCTION_LINE("Created heap @%08X, size %d KiB", heap, size / 1024);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
OSUnlockMutex(&allocMutex);
|
//OSUnlockMutex(&allocMutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MemoryMapping_DestroyHeaps() {
|
void MemoryMapping_DestroyHeaps() {
|
||||||
OSLockMutex(&allocMutex);
|
//OSLockMutex(&allocMutex);
|
||||||
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) {
|
||||||
break;
|
break;
|
||||||
|
|
@ -796,7 +796,7 @@ void MemoryMapping_DestroyHeaps() {
|
||||||
memset(address, 0, size);
|
memset(address, 0, size);
|
||||||
DEBUG_FUNCTION_LINE_VERBOSE("Destroyed heap @%08X", address);
|
DEBUG_FUNCTION_LINE_VERBOSE("Destroyed heap @%08X", address);
|
||||||
}
|
}
|
||||||
OSUnlockMutex(&allocMutex);
|
//OSUnlockMutex(&allocMutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t MemoryMapping_getAreaSizeFromPageTable(uint32_t start, uint32_t maxSize) {
|
uint32_t MemoryMapping_getAreaSizeFromPageTable(uint32_t start, uint32_t maxSize) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user