diff options
author | Lioncash <mathew1800@gmail.com> | 2019-07-24 12:57:57 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-08-30 01:28:04 +0200 |
commit | 70485e690bbab456290999a2796fa46f8f55e4fd (patch) | |
tree | 9d9919e2b0bd174240a252106f3a687f75be2acb | |
parent | kernel/vm_manager: Simplify some assertion messages (diff) | |
download | yuzu-70485e690bbab456290999a2796fa46f8f55e4fd.tar yuzu-70485e690bbab456290999a2796fa46f8f55e4fd.tar.gz yuzu-70485e690bbab456290999a2796fa46f8f55e4fd.tar.bz2 yuzu-70485e690bbab456290999a2796fa46f8f55e4fd.tar.lz yuzu-70485e690bbab456290999a2796fa46f8f55e4fd.tar.xz yuzu-70485e690bbab456290999a2796fa46f8f55e4fd.tar.zst yuzu-70485e690bbab456290999a2796fa46f8f55e4fd.zip |
-rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index 21ab01240..231e42baa 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp @@ -342,7 +342,7 @@ ResultCode VMManager::MapPhysicalMemory(VAddr target, u64 size) { const auto map_size = std::min(end_addr - cur_addr, vma_end - cur_addr); if (vma.state == MemoryState::Unmapped) { const auto map_res = - MapMemoryBlock(cur_addr, std::make_shared<PhysicalMemory>(map_size, 0), 0, + MapMemoryBlock(cur_addr, std::make_shared<PhysicalMemory>(map_size), 0, map_size, MemoryState::Heap, VMAPermission::ReadWrite); result = map_res.Code(); if (result.IsError()) { @@ -443,7 +443,7 @@ ResultCode VMManager::UnmapPhysicalMemory(VAddr target, u64 size) { if (result.IsError()) { for (const auto [map_address, map_size] : unmapped_regions) { const auto remap_res = - MapMemoryBlock(map_address, std::make_shared<PhysicalMemory>(map_size, 0), 0, + MapMemoryBlock(map_address, std::make_shared<PhysicalMemory>(map_size), 0, map_size, MemoryState::Heap, VMAPermission::None); ASSERT_MSG(remap_res.Succeeded(), "Failed to remap a memory block."); } |