diff options
author | Lioncash <mathew1800@gmail.com> | 2018-09-30 00:47:00 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-09-30 08:30:01 +0200 |
commit | cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4 (patch) | |
tree | a9e0bbc02013f0dbc6409af9c8685a8b8b9e9f32 /src/core/hle/kernel/shared_memory.cpp | |
parent | arm_interface: Add missing fpsr/tpidr members to the ThreadContext struct (diff) | |
download | yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.tar yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.tar.gz yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.tar.bz2 yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.tar.lz yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.tar.xz yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.tar.zst yuzu-cf9d6c6f526fffb2bf414ff774c5d0281a73ecf4.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 9b78c8cb5..d061e6155 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -35,11 +35,11 @@ SharedPtr<SharedMemory> SharedMemory::Create(KernelCore& kernel, SharedPtr<Proce // Refresh the address mappings for the current process. if (Core::CurrentProcess() != nullptr) { - Core::CurrentProcess()->vm_manager.RefreshMemoryBlockMappings( + Core::CurrentProcess()->VMManager().RefreshMemoryBlockMappings( shared_memory->backing_block.get()); } } else { - auto& vm_manager = shared_memory->owner_process->vm_manager; + 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); @@ -73,7 +73,7 @@ SharedPtr<SharedMemory> SharedMemory::CreateForApplet( shared_memory->backing_block = std::move(heap_block); shared_memory->backing_block_offset = offset; shared_memory->base_address = - kernel.CurrentProcess()->vm_manager.GetHeapRegionBaseAddress() + offset; + kernel.CurrentProcess()->VMManager().GetHeapRegionBaseAddress() + offset; return shared_memory; } @@ -107,7 +107,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi VAddr target_address = address; // Map the memory block into the target process - auto result = target_process->vm_manager.MapMemoryBlock( + auto result = target_process->VMManager().MapMemoryBlock( target_address, backing_block, backing_block_offset, size, MemoryState::Shared); if (result.Failed()) { LOG_ERROR( @@ -117,14 +117,14 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi return result.Code(); } - return target_process->vm_manager.ReprotectRange(target_address, size, - ConvertPermissions(permissions)); + return target_process->VMManager().ReprotectRange(target_address, size, + ConvertPermissions(permissions)); } ResultCode SharedMemory::Unmap(Process* target_process, VAddr address) { // TODO(Subv): Verify what happens if the application tries to unmap an address that is not // mapped to a SharedMemory. - return target_process->vm_manager.UnmapRange(address, size); + return target_process->VMManager().UnmapRange(address, size); } VMAPermission SharedMemory::ConvertPermissions(MemoryPermission permission) { |