diff options
author | Lioncash <mathew1800@gmail.com> | 2018-11-19 15:05:04 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-11-19 15:20:29 +0100 |
commit | 233e495c1411a813460ce71efb7be69ff73649ee (patch) | |
tree | 779b543b44f0f5ed7a2515d0d54e0d2082047253 /src/core/hle/kernel/shared_memory.cpp | |
parent | kernel/shared_memory: Add a const qualified member function overload for GetPointer() (diff) | |
download | yuzu-233e495c1411a813460ce71efb7be69ff73649ee.tar yuzu-233e495c1411a813460ce71efb7be69ff73649ee.tar.gz yuzu-233e495c1411a813460ce71efb7be69ff73649ee.tar.bz2 yuzu-233e495c1411a813460ce71efb7be69ff73649ee.tar.lz yuzu-233e495c1411a813460ce71efb7be69ff73649ee.tar.xz yuzu-233e495c1411a813460ce71efb7be69ff73649ee.tar.zst yuzu-233e495c1411a813460ce71efb7be69ff73649ee.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 b8bcc16ee..0494581f5 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -78,10 +78,10 @@ SharedPtr<SharedMemory> SharedMemory::CreateForApplet( return shared_memory; } -ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermission permissions, +ResultCode SharedMemory::Map(Process& target_process, VAddr address, MemoryPermission permissions, MemoryPermission other_permissions) { const MemoryPermission own_other_permissions = - target_process == owner_process ? this->permissions : this->other_permissions; + &target_process == owner_process ? this->permissions : this->other_permissions; // Automatically allocated memory blocks can only be mapped with other_permissions = DontCare if (base_address == 0 && other_permissions != MemoryPermission::DontCare) { @@ -106,7 +106,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->VMManager().MapMemoryBlock( + auto result = target_process.VMManager().MapMemoryBlock( target_address, backing_block, backing_block_offset, size, MemoryState::Shared); if (result.Failed()) { LOG_ERROR( @@ -116,14 +116,14 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi return result.Code(); } - return target_process->VMManager().ReprotectRange(target_address, size, - ConvertPermissions(permissions)); + return target_process.VMManager().ReprotectRange(target_address, size, + ConvertPermissions(permissions)); } -ResultCode SharedMemory::Unmap(Process* target_process, VAddr address) { +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->VMManager().UnmapRange(address, size); + return target_process.VMManager().UnmapRange(address, size); } VMAPermission SharedMemory::ConvertPermissions(MemoryPermission permission) { |