summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/mutex.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-30 10:02:50 -0400
committerGravatar GitHub2018-08-30 10:02:50 -0400
commit5094dfa081c7275e35496374a42996b11f0f6005 (patch)
tree8cdfb8c270c6299a1b172fb9c14856684bedf084 /src/core/hle/kernel/mutex.cpp
parentMerge pull request #1202 from FearlessTobi/port-3825 (diff)
parentkernel: Eliminate kernel global state (diff)
downloadyuzu-5094dfa081c7275e35496374a42996b11f0f6005.tar.gz
yuzu-5094dfa081c7275e35496374a42996b11f0f6005.tar.xz
yuzu-5094dfa081c7275e35496374a42996b11f0f6005.zip
Merge pull request #1198 from lioncash/kernel
kernel: Eliminate kernel global state
Diffstat (limited to 'src/core/hle/kernel/mutex.cpp')
-rw-r--r--src/core/hle/kernel/mutex.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index cb7f58b35..36bf0b677 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -58,15 +58,15 @@ static void TransferMutexOwnership(VAddr mutex_addr, SharedPtr<Thread> current_t
58 } 58 }
59} 59}
60 60
61ResultCode Mutex::TryAcquire(VAddr address, Handle holding_thread_handle, 61ResultCode Mutex::TryAcquire(HandleTable& handle_table, VAddr address, Handle holding_thread_handle,
62 Handle requesting_thread_handle) { 62 Handle requesting_thread_handle) {
63 // The mutex address must be 4-byte aligned 63 // The mutex address must be 4-byte aligned
64 if ((address % sizeof(u32)) != 0) { 64 if ((address % sizeof(u32)) != 0) {
65 return ResultCode(ErrorModule::Kernel, ErrCodes::InvalidAddress); 65 return ResultCode(ErrorModule::Kernel, ErrCodes::InvalidAddress);
66 } 66 }
67 67
68 SharedPtr<Thread> holding_thread = g_handle_table.Get<Thread>(holding_thread_handle); 68 SharedPtr<Thread> holding_thread = handle_table.Get<Thread>(holding_thread_handle);
69 SharedPtr<Thread> requesting_thread = g_handle_table.Get<Thread>(requesting_thread_handle); 69 SharedPtr<Thread> requesting_thread = handle_table.Get<Thread>(requesting_thread_handle);
70 70
71 // TODO(Subv): It is currently unknown if it is possible to lock a mutex in behalf of another 71 // TODO(Subv): It is currently unknown if it is possible to lock a mutex in behalf of another
72 // thread. 72 // thread.