diff options
| author |  bunnei | 2018-11-18 19:23:38 -0800 |
|---|---|---|
| committer |  GitHub | 2018-11-18 19:23:38 -0800 |
| commit | e34d47e6e36f5c99211d0382eded6dbb78ed805e (patch) | |
| tree | 262bc94da150ef3b2995d72671ac075c2053ef4f /src/core/hle/kernel/process.cpp | |
| parent | Merge pull request #1718 from ogniK5377/lets-go-softlock (diff) | |
| parent | ldr_ro: Add error check for memory allocation failure (diff) | |
| download | yuzu-e34d47e6e36f5c99211d0382eded6dbb78ed805e.tar.gz yuzu-e34d47e6e36f5c99211d0382eded6dbb78ed805e.tar.xz yuzu-e34d47e6e36f5c99211d0382eded6dbb78ed805e.zip | |
Merge pull request #1620 from DarkLordZach/ldr-ro
ldr_ro: Complete LDR:RO implementation
Diffstat (limited to 'src/core/hle/kernel/process.cpp')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index f06b6bb55..a257c3726 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp | |||
| @@ -252,8 +252,8 @@ ResultCode Process::HeapFree(VAddr target, u32 size) { | |||
| 252 | return vm_manager.HeapFree(target, size); | 252 | return vm_manager.HeapFree(target, size); |
| 253 | } | 253 | } |
| 254 | 254 | ||
| 255 | ResultCode Process::MirrorMemory(VAddr dst_addr, VAddr src_addr, u64 size) { | 255 | ResultCode Process::MirrorMemory(VAddr dst_addr, VAddr src_addr, u64 size, MemoryState state) { |
| 256 | return vm_manager.MirrorMemory(dst_addr, src_addr, size); | 256 | return vm_manager.MirrorMemory(dst_addr, src_addr, size, state); |
| 257 | } | 257 | } |
| 258 | 258 | ||
| 259 | ResultCode Process::UnmapMemory(VAddr dst_addr, VAddr /*src_addr*/, u64 size) { | 259 | ResultCode Process::UnmapMemory(VAddr dst_addr, VAddr /*src_addr*/, u64 size) { |