diff options
author | Lioncash <mathew1800@gmail.com> | 2019-03-14 05:29:54 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-03-15 01:55:52 +0100 |
commit | 555cd26ec2b848634370a14d41b7e79b6c6beecd (patch) | |
tree | 4ec6b8245280f94b44969356c9f2a44b22abd00e /src/core/hle/kernel/svc.cpp | |
parent | Merge pull request #2230 from lioncash/global (diff) | |
download | yuzu-555cd26ec2b848634370a14d41b7e79b6c6beecd.tar yuzu-555cd26ec2b848634370a14d41b7e79b6c6beecd.tar.gz yuzu-555cd26ec2b848634370a14d41b7e79b6c6beecd.tar.bz2 yuzu-555cd26ec2b848634370a14d41b7e79b6c6beecd.tar.lz yuzu-555cd26ec2b848634370a14d41b7e79b6c6beecd.tar.xz yuzu-555cd26ec2b848634370a14d41b7e79b6c6beecd.tar.zst yuzu-555cd26ec2b848634370a14d41b7e79b6c6beecd.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/svc.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 77d0e3d96..599609944 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -551,9 +551,9 @@ static ResultCode ArbitrateLock(Handle holding_thread_handle, VAddr mutex_addr, return ERR_INVALID_ADDRESS; } - auto& handle_table = Core::CurrentProcess()->GetHandleTable(); - return Mutex::TryAcquire(handle_table, mutex_addr, holding_thread_handle, - requesting_thread_handle); + auto* const current_process = Core::System::GetInstance().Kernel().CurrentProcess(); + return current_process->GetMutex().TryAcquire(mutex_addr, holding_thread_handle, + requesting_thread_handle); } /// Unlock a mutex @@ -571,7 +571,8 @@ static ResultCode ArbitrateUnlock(VAddr mutex_addr) { return ERR_INVALID_ADDRESS; } - return Mutex::Release(mutex_addr); + auto* const current_process = Core::System::GetInstance().Kernel().CurrentProcess(); + return current_process->GetMutex().Release(mutex_addr); } enum class BreakType : u32 { @@ -1336,11 +1337,15 @@ static ResultCode WaitProcessWideKeyAtomic(VAddr mutex_addr, VAddr condition_var "called mutex_addr={:X}, condition_variable_addr={:X}, thread_handle=0x{:08X}, timeout={}", mutex_addr, condition_variable_addr, thread_handle, nano_seconds); - const auto& handle_table = Core::CurrentProcess()->GetHandleTable(); + auto* const current_process = Core::System::GetInstance().Kernel().CurrentProcess(); + const auto& handle_table = current_process->GetHandleTable(); SharedPtr<Thread> thread = handle_table.Get<Thread>(thread_handle); ASSERT(thread); - CASCADE_CODE(Mutex::Release(mutex_addr)); + const auto release_result = current_process->GetMutex().Release(mutex_addr); + if (release_result.IsError()) { + return release_result; + } SharedPtr<Thread> current_thread = GetCurrentThread(); current_thread->SetCondVarWaitAddress(condition_variable_addr); |