summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/k_address_arbiter.cpp
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-03-27 18:16:40 +0200
committerGitHub <noreply@github.com>2023-03-27 18:16:40 +0200
commit0661f5ccd1704935dc9c49521a79cc26832db3b0 (patch)
treee0923dd40e8dd0f6ec92a2de7722f911bd26c514 /src/core/hle/kernel/k_address_arbiter.cpp
parentMerge pull request #9995 from german77/plain (diff)
parentmemory: rename global memory references to application memory (diff)
downloadyuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.gz
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.bz2
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.lz
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.xz
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.zst
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.zip
Diffstat (limited to 'src/core/hle/kernel/k_address_arbiter.cpp')
-rw-r--r--src/core/hle/kernel/k_address_arbiter.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/k_address_arbiter.cpp b/src/core/hle/kernel/k_address_arbiter.cpp
index 274928dcf..08c254028 100644
--- a/src/core/hle/kernel/k_address_arbiter.cpp
+++ b/src/core/hle/kernel/k_address_arbiter.cpp
@@ -21,8 +21,8 @@ KAddressArbiter::~KAddressArbiter() = default;
namespace {
-bool ReadFromUser(Core::System& system, s32* out, KProcessAddress address) {
- *out = system.Memory().Read32(GetInteger(address));
+bool ReadFromUser(KernelCore& kernel, s32* out, KProcessAddress address) {
+ *out = GetCurrentMemory(kernel).Read32(GetInteger(address));
return true;
}
@@ -209,7 +209,7 @@ Result KAddressArbiter::SignalAndModifyByWaitingCountIfEqual(uint64_t addr, s32
if (value != new_value) {
succeeded = UpdateIfEqual(m_system, std::addressof(user_value), addr, value, new_value);
} else {
- succeeded = ReadFromUser(m_system, std::addressof(user_value), addr);
+ succeeded = ReadFromUser(m_kernel, std::addressof(user_value), addr);
}
R_UNLESS(succeeded, ResultInvalidCurrentMemory);
@@ -252,7 +252,7 @@ Result KAddressArbiter::WaitIfLessThan(uint64_t addr, s32 value, bool decrement,
if (decrement) {
succeeded = DecrementIfLessThan(m_system, std::addressof(user_value), addr, value);
} else {
- succeeded = ReadFromUser(m_system, std::addressof(user_value), addr);
+ succeeded = ReadFromUser(m_kernel, std::addressof(user_value), addr);
}
if (!succeeded) {
@@ -303,7 +303,7 @@ Result KAddressArbiter::WaitIfEqual(uint64_t addr, s32 value, s64 timeout) {
// Read the value from userspace.
s32 user_value{};
- if (!ReadFromUser(m_system, std::addressof(user_value), addr)) {
+ if (!ReadFromUser(m_kernel, std::addressof(user_value), addr)) {
slp.CancelSleep();
R_THROW(ResultInvalidCurrentMemory);
}