diff options
author | Michael Scire <SciresM@gmail.com> | 2018-07-17 04:55:53 +0200 |
---|---|---|
committer | Michael Scire <SciresM@gmail.com> | 2018-07-17 04:55:53 +0200 |
commit | 3b885691a1ec33b0105d8e863dc003a7e019649b (patch) | |
tree | 11ef40d89e5995e4fad65b5f949bd68e36d0236b /src/core/hle | |
parent | Merge pull request #669 from lioncash/dynarmic (diff) | |
download | yuzu-3b885691a1ec33b0105d8e863dc003a7e019649b.tar yuzu-3b885691a1ec33b0105d8e863dc003a7e019649b.tar.gz yuzu-3b885691a1ec33b0105d8e863dc003a7e019649b.tar.bz2 yuzu-3b885691a1ec33b0105d8e863dc003a7e019649b.tar.lz yuzu-3b885691a1ec33b0105d8e863dc003a7e019649b.tar.xz yuzu-3b885691a1ec33b0105d8e863dc003a7e019649b.tar.zst yuzu-3b885691a1ec33b0105d8e863dc003a7e019649b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/address_arbiter.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp index e9c8369d7..d5df9590a 100644 --- a/src/core/hle/kernel/address_arbiter.cpp +++ b/src/core/hle/kernel/address_arbiter.cpp @@ -115,7 +115,7 @@ ResultCode ModifyByWaitingCountAndSignalToAddressIfEqual(VAddr address, s32 valu s32 updated_value; if (waiting_threads.size() == 0) { 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; } else { 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)); 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 { return ERR_INVALID_STATE; } |