summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/shared_memory.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-12-06 16:59:22 +0100
committerLioncash <mathew1800@gmail.com>2018-12-06 21:02:17 +0100
commitd4c1b9d311c978a6354574d09c451522ceb74e82 (patch)
tree4fd85da1f82ec31892c6645e45d2a04f6e010b9f /src/core/hle/kernel/shared_memory.cpp
parentMerge pull request #1870 from heapo/pagetable_shrink_to_fit (diff)
downloadyuzu-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 '')
-rw-r--r--src/core/hle/kernel/shared_memory.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index 0494581f5..d1ca60125 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -39,15 +39,15 @@ SharedPtr<SharedMemory> SharedMemory::Create(KernelCore& kernel, SharedPtr<Proce
shared_memory->backing_block.get());
}
} else {
- auto& vm_manager = shared_memory->owner_process->VMManager();
+ const auto& vm_manager = shared_memory->owner_process->VMManager();
// The memory is already available and mapped in the owner process.
- auto vma = vm_manager.FindVMA(address);
- ASSERT_MSG(vma != vm_manager.vma_map.end(), "Invalid memory address");
+ const auto vma = vm_manager.FindVMA(address);
+ ASSERT_MSG(vm_manager.IsValidHandle(vma), "Invalid memory address");
ASSERT_MSG(vma->second.backing_block, "Backing block doesn't exist for address");
// The returned VMA might be a bigger one encompassing the desired address.
- auto vma_offset = address - vma->first;
+ const auto vma_offset = address - vma->first;
ASSERT_MSG(vma_offset + size <= vma->second.size,
"Shared memory exceeds bounds of mapped block");