diff options
| author | bunnei <bunneidev@gmail.com> | 2018-12-10 10:09:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-10 10:09:50 -0500 |
| commit | 74242a8fb459c656ba26308bc5d08da3fd5db1a1 (patch) | |
| tree | 492582574dc559b463aa51581017c4cf1d8cef0d /src/core/hle/kernel/shared_memory.cpp | |
| parent | be657036be7010f3705cb6b06d24c15e4d56414a (diff) | |
| parent | 15e3d4f357f02275bc10818536f563b08f3326c9 (diff) | |
Merge pull request #1876 from lioncash/vma
vm_manager: Make vma_map private
Diffstat (limited to 'src/core/hle/kernel/shared_memory.cpp')
| -rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 8 |
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"); |
