diff options
| author |  Yuri Kunde Schlesner | 2017-06-21 20:21:49 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2017-06-21 22:55:17 -0700 |
| commit | 326e7c70208865b013e138972b25687d805488d0 (patch) | |
| tree | b88cd1431d0069052b0bab969ba480a9278f8c22 /src/core/hle/kernel | |
| parent | Merge pull request #2792 from wwylele/lutlutlut (diff) | |
| download | yuzu-326e7c70208865b013e138972b25687d805488d0.tar.gz yuzu-326e7c70208865b013e138972b25687d805488d0.tar.xz yuzu-326e7c70208865b013e138972b25687d805488d0.zip | |
Memory: Make PhysicalToVirtualAddress return a boost::optional
And fix a few places in the code to take advantage of that.
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 922e5ab58..a7b66142f 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp | |||
| @@ -149,7 +149,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi | |||
| 149 | 149 | ||
| 150 | if (base_address == 0 && target_address == 0) { | 150 | if (base_address == 0 && target_address == 0) { |
| 151 | // Calculate the address at which to map the memory block. | 151 | // Calculate the address at which to map the memory block. |
| 152 | target_address = Memory::PhysicalToVirtualAddress(linear_heap_phys_address); | 152 | target_address = Memory::PhysicalToVirtualAddress(linear_heap_phys_address).value(); |
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | // Map the memory block into the target process | 155 | // Map the memory block into the target process |