diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-19 04:03:15 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-19 04:03:15 +0200 |
commit | 723dc644faa6e29250d1b7fa914dfb7c75d8aec5 (patch) | |
tree | c7ad927e2cbe1424046e279b3212ac895f4b1e87 /src/core/hle/kernel/memory.cpp | |
parent | ResultVal: Add an rvalue overload of Unwrap() (diff) | |
download | yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.gz yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.bz2 yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.lz yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.xz yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.zst yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.zip |
Diffstat (limited to 'src/core/hle/kernel/memory.cpp')
-rw-r--r-- | src/core/hle/kernel/memory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp index 804f23b1c..496d07cb5 100644 --- a/src/core/hle/kernel/memory.cpp +++ b/src/core/hle/kernel/memory.cpp @@ -166,7 +166,7 @@ void HandleSpecialMapping(VMManager& address_space, const AddressMapping& mappin auto vma = address_space .MapBackingMemory(mapping.address, target_pointer + offset_into_region, mapping.size, memory_state) - .MoveFrom(); + .Unwrap(); address_space.Reprotect(vma, mapping.read_only ? VMAPermission::Read : VMAPermission::ReadWrite); } @@ -176,14 +176,14 @@ void MapSharedPages(VMManager& address_space) { .MapBackingMemory(Memory::CONFIG_MEMORY_VADDR, reinterpret_cast<u8*>(&ConfigMem::config_mem), Memory::CONFIG_MEMORY_SIZE, MemoryState::Shared) - .MoveFrom(); + .Unwrap(); address_space.Reprotect(cfg_mem_vma, VMAPermission::Read); auto shared_page_vma = address_space .MapBackingMemory(Memory::SHARED_PAGE_VADDR, reinterpret_cast<u8*>(&SharedPage::shared_page), Memory::SHARED_PAGE_SIZE, MemoryState::Shared) - .MoveFrom(); + .Unwrap(); address_space.Reprotect(shared_page_vma, VMAPermission::Read); } |