diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp index 5a5394ade4..60ad058778 100644 --- a/Source/Core/Common/MemArena.cpp +++ b/Source/Core/Common/MemArena.cpp @@ -49,7 +49,7 @@ static int AshmemCreateFileMapping(const char *name, size_t size) } #endif -void MemArena::GrabLowMemSpace(size_t size) +void MemArena::GrabSHMSegment(size_t size) { #ifdef _WIN32 hMemoryMapping = CreateFileMapping(INVALID_HANDLE_VALUE, nullptr, PAGE_READWRITE, 0, (DWORD)(size), nullptr); @@ -82,7 +82,7 @@ void MemArena::GrabLowMemSpace(size_t size) } -void MemArena::ReleaseSpace() +void MemArena::ReleaseSHMSegment() { #ifdef _WIN32 CloseHandle(hMemoryMapping); @@ -244,8 +244,8 @@ u8 *MemoryMap_Setup(MemoryView *views, int num_views, u32 flags, MemArena *arena if ((views[i].flags & MV_MIRROR_PREVIOUS) == 0) total_mem += views[i].size; } - // Grab some pagefile backed memory out of the void ... - arena->GrabLowMemSpace(total_mem); + + arena->GrabSHMSegment(total_mem); // Now, create views in high memory where there's plenty of space. u8 *base = MemArena::Find4GBBase(); diff --git a/Source/Core/Common/MemArena.h b/Source/Core/Common/MemArena.h index d3ca8209c3..67482432fd 100644 --- a/Source/Core/Common/MemArena.h +++ b/Source/Core/Common/MemArena.h @@ -19,8 +19,8 @@ class MemArena { public: - void GrabLowMemSpace(size_t size); - void ReleaseSpace(); + void GrabSHMSegment(size_t size); + void ReleaseSHMSegment(); void *CreateView(s64 offset, size_t size, void *base = nullptr); void ReleaseView(void *view, size_t size); diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp index 21387577bd..d89647592e 100644 --- a/Source/Core/Core/HW/Memmap.cpp +++ b/Source/Core/Core/HW/Memmap.cpp @@ -163,7 +163,7 @@ void Shutdown() if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) flags |= MV_WII_ONLY; if (bFakeVMEM) flags |= MV_FAKE_VMEM; MemoryMap_Shutdown(views, num_views, flags, &g_arena); - g_arena.ReleaseSpace(); + g_arena.ReleaseSHMSegment(); base = nullptr; delete mmio_mapping; INFO_LOG(MEMMAP, "Memory system shut down.");