diff options
author | Lioncash <mathew1800@gmail.com> | 2018-12-06 16:59:22 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-12-06 21:02:17 +0100 |
commit | d4c1b9d311c978a6354574d09c451522ceb74e82 (patch) | |
tree | 4fd85da1f82ec31892c6645e45d2a04f6e010b9f /src/core/memory.cpp | |
parent | Merge pull request #1870 from heapo/pagetable_shrink_to_fit (diff) | |
download | yuzu-d4c1b9d311c978a6354574d09c451522ceb74e82.tar yuzu-d4c1b9d311c978a6354574d09c451522ceb74e82.tar.gz yuzu-d4c1b9d311c978a6354574d09c451522ceb74e82.tar.bz2 yuzu-d4c1b9d311c978a6354574d09c451522ceb74e82.tar.lz yuzu-d4c1b9d311c978a6354574d09c451522ceb74e82.tar.xz yuzu-d4c1b9d311c978a6354574d09c451522ceb74e82.tar.zst yuzu-d4c1b9d311c978a6354574d09c451522ceb74e82.zip |
Diffstat (limited to 'src/core/memory.cpp')
-rw-r--r-- | src/core/memory.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 41fd2a6a0..76f468c78 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); + 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; |