Merge pull request #1876 from lioncash/vma

vm_manager: Make vma_map private

1 files changed, 5 insertions, 6 deletions

diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 41fd2a6a01..643afdee87 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -125,14 +125,13 @@ void RemoveDebugHook(PageTable& page_table, VAddr base, u64 size, MemoryHookPoin
  * using a VMA from the current process
  */
 static u8* GetPointerFromVMA(const Kernel::Process& process, VAddr vaddr) {
-    u8* direct_pointer = nullptr;
-
-    auto& vm_manager = process.VMManager();
+    const auto& vm_manager = process.VMManager();
 
-    auto it = vm_manager.FindVMA(vaddr);
-    ASSERT(it != vm_manager.vma_map.end());
+    const auto it = vm_manager.FindVMA(vaddr);
+    DEBUG_ASSERT(vm_manager.IsValidHandle(it));
 
-    auto& vma = it->second;
+    u8* direct_pointer = nullptr;
+    const auto& vma = it->second;
     switch (vma.type) {
     case Kernel::VMAType::AllocatedMemoryBlock:
         direct_pointer = vma.backing_block->data() + vma.offset;