diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-03-27 12:16:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-27 12:16:40 -0400 |
| commit | 0661f5ccd1704935dc9c49521a79cc26832db3b0 (patch) | |
| tree | e0923dd40e8dd0f6ec92a2de7722f911bd26c514 /src/core/hle/kernel/svc/svc_ipc.cpp | |
| parent | 3b30f5d8235a8b1118ffb9da932ffd3e6e15a3f6 (diff) | |
| parent | 41d99aa89db7ee483112e49baa6c86e14adbd168 (diff) | |
Merge pull request #9984 from liamwhite/global-memory
memory: rename global memory references to application memory
Diffstat (limited to 'src/core/hle/kernel/svc/svc_ipc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc/svc_ipc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/svc/svc_ipc.cpp b/src/core/hle/kernel/svc/svc_ipc.cpp index 2a8c09a79..ea03068aa 100644 --- a/src/core/hle/kernel/svc/svc_ipc.cpp +++ b/src/core/hle/kernel/svc/svc_ipc.cpp @@ -41,12 +41,12 @@ Result ReplyAndReceive(Core::System& system, s32* out_index, uint64_t handles_ad auto& handle_table = GetCurrentProcess(kernel).GetHandleTable(); R_UNLESS(0 <= num_handles && num_handles <= ArgumentHandleCountMax, ResultOutOfRange); - R_UNLESS(system.Memory().IsValidVirtualAddressRange( + R_UNLESS(GetCurrentMemory(kernel).IsValidVirtualAddressRange( handles_addr, static_cast<u64>(sizeof(Handle) * num_handles)), ResultInvalidPointer); std::vector<Handle> handles(num_handles); - system.Memory().ReadBlock(handles_addr, handles.data(), sizeof(Handle) * num_handles); + GetCurrentMemory(kernel).ReadBlock(handles_addr, handles.data(), sizeof(Handle) * num_handles); // Convert handle list to object table. std::vector<KSynchronizationObject*> objs(num_handles); |