The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-26 00:34:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Read address atomically in WaitForAddress

Browse Source 
We didn't read the values for arbitration atomically in all cases as we should have, this consolidates the reading of the value and uses the value across all cases.
This commit is contained in:
PixelyIon 2022-11-26 00:16:52 +05:30 committed by Mark Collins
parent e8a1bd1aad
commit d0c56235f4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/cpp/skyline/kernel/types/KProcess.cpp
View File

@ -288,14 +288,14 @@ namespace skyline::kernel::type {
{ {
std::scoped_lock lock{syncWaiterMutex}; std::scoped_lock lock{syncWaiterMutex};
u32 userValue{__atomic_load_n(address, __ATOMIC_SEQ_CST)};
switch (type) { switch (type) {
case ArbitrationType::WaitIfLessThan: case ArbitrationType::WaitIfLessThan:
if (*address >= value) [[unlikely]] if (userValue >= value) [[unlikely]]
return result::InvalidState; return result::InvalidState;
break; break;
case ArbitrationType::DecrementAndWaitIfLessThan: { case ArbitrationType::DecrementAndWaitIfLessThan: {
u32 userValue{__atomic_load_n(address, __ATOMIC_SEQ_CST)};
do { do {
if (value <= userValue) [[unlikely]] // We want to explicitly decrement **after** the check if (value <= userValue) [[unlikely]] // We want to explicitly decrement **after** the check
return result::InvalidState; return result::InvalidState;
@ -304,7 +304,7 @@ namespace skyline::kernel::type {
} }
case ArbitrationType::WaitIfEqual: case ArbitrationType::WaitIfEqual:
if (*address != value) [[unlikely]] if (userValue != value) [[unlikely]]
return result::InvalidState; return result::InvalidState;
break; break;
} }