diff options
author | Liam <byteslice@airmail.cc> | 2023-12-12 02:21:23 +0100 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-12-23 03:52:49 +0100 |
commit | 419055e484f0f0073d5832f7ded5fd3a3e5ad7de (patch) | |
tree | 81ff70e80fff780d6fb92f78a2df18cfc323df78 /src/core/hle/kernel/k_condition_variable.cpp | |
parent | Merge pull request #12412 from ameerj/gl-query-prims (diff) | |
download | yuzu-419055e484f0f0073d5832f7ded5fd3a3e5ad7de.tar yuzu-419055e484f0f0073d5832f7ded5fd3a3e5ad7de.tar.gz yuzu-419055e484f0f0073d5832f7ded5fd3a3e5ad7de.tar.bz2 yuzu-419055e484f0f0073d5832f7ded5fd3a3e5ad7de.tar.lz yuzu-419055e484f0f0073d5832f7ded5fd3a3e5ad7de.tar.xz yuzu-419055e484f0f0073d5832f7ded5fd3a3e5ad7de.tar.zst yuzu-419055e484f0f0073d5832f7ded5fd3a3e5ad7de.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/k_condition_variable.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index 7633a51fb..94ea3527a 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -28,10 +28,10 @@ bool WriteToUser(KernelCore& kernel, KProcessAddress address, const u32* p) { return true; } -bool UpdateLockAtomic(Core::System& system, u32* out, KProcessAddress address, u32 if_zero, +bool UpdateLockAtomic(KernelCore& kernel, u32* out, KProcessAddress address, u32 if_zero, u32 new_orr_mask) { - auto& monitor = system.Monitor(); - const auto current_core = system.Kernel().CurrentPhysicalCoreIndex(); + auto& monitor = GetCurrentProcess(kernel).GetExclusiveMonitor(); + const auto current_core = kernel.CurrentPhysicalCoreIndex(); u32 expected{}; @@ -208,7 +208,7 @@ void KConditionVariable::SignalImpl(KThread* thread) { // TODO(bunnei): We should call CanAccessAtomic(..) here. can_access = true; if (can_access) [[likely]] { - UpdateLockAtomic(m_system, std::addressof(prev_tag), address, own_tag, + UpdateLockAtomic(m_kernel, std::addressof(prev_tag), address, own_tag, Svc::HandleWaitMask); } } |