summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2015-01-05 00:05:50 -0500
committerGravatar bunnei2015-01-05 00:05:50 -0500
commitcc23269ff4d4dbd38d6e76aa6c2f1d76c53f2e30 (patch)
treef7896835845db0d11e77588402ff3636895da217 /src
parentMerge pull request #415 from Dante38490/master (diff)
parentAddressArbiter: Ported arbitration type 2 from 3dmoo. (diff)
downloadyuzu-cc23269ff4d4dbd38d6e76aa6c2f1d76c53f2e30.tar.gz
yuzu-cc23269ff4d4dbd38d6e76aa6c2f1d76c53f2e30.tar.xz
yuzu-cc23269ff4d4dbd38d6e76aa6c2f1d76c53f2e30.zip
Merge pull request #407 from Subv/arbiter
AddressArbiter: Ported arbitration type 2 from 3dmoo.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/address_arbiter.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp
index 38705e3cd..736bbc36a 100644
--- a/src/core/hle/kernel/address_arbiter.cpp
+++ b/src/core/hle/kernel/address_arbiter.cpp
@@ -51,6 +51,17 @@ ResultCode ArbitrateAddress(Handle handle, ArbitrationType type, u32 address, s3
51 HLE::Reschedule(__func__); 51 HLE::Reschedule(__func__);
52 } 52 }
53 break; 53 break;
54
55 case ArbitrationType::DecrementAndWaitIfLessThan:
56 {
57 s32 memory_value = Memory::Read32(address) - 1;
58 Memory::Write32(address, memory_value);
59 if (memory_value <= value) {
60 Kernel::WaitCurrentThread(WAITTYPE_ARB, handle, address);
61 HLE::Reschedule(__func__);
62 }
63 break;
64 }
54 65
55 default: 66 default:
56 LOG_ERROR(Kernel, "unknown type=%d", type); 67 LOG_ERROR(Kernel, "unknown type=%d", type);