mirrors/yuzu
2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00
Code Issues Releases Activity

Merge pull request #672 from SciresM/to_address_fix

Browse source 
svc:: Fix bug in svcWaitForAddress
This commit is contained in:
bunnei 2018-07-17 07:32:42 -07:00 committed by GitHub
commit 519035db3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/hle/kernel/address_arbiter.cpp
View file

@ -115,7 +115,7 @@ ResultCode ModifyByWaitingCountAndSignalToAddressIfEqual(VAddr address, s32 valu
s32 updated_value; s32 updated_value;
if (waiting_threads.size() == 0) { if (waiting_threads.size() == 0) {
updated_value = value - 1; updated_value = value - 1;
} else if (num_to_wake <= 0 || waiting_threads.size() <= num_to_wake) { } else if (num_to_wake <= 0 || waiting_threads.size() <= static_cast<u32>(num_to_wake)) {
updated_value = value + 1; updated_value = value + 1;
} else { } else {
updated_value = value; updated_value = value;
@ -140,7 +140,9 @@ ResultCode WaitForAddressIfLessThan(VAddr address, s32 value, s64 timeout, bool
s32 cur_value = static_cast<s32>(Memory::Read32(address)); s32 cur_value = static_cast<s32>(Memory::Read32(address));
if (cur_value < value) { if (cur_value < value) {
Memory::Write32(address, static_cast<u32>(cur_value - 1)); if (should_decrement) {
Memory::Write32(address, static_cast<u32>(cur_value - 1));
}
} else { } else {
return ERR_INVALID_STATE; return ERR_INVALID_STATE;
} }