diff options
author | MerryMage <MerryMage@users.noreply.github.com> | 2018-03-24 10:02:19 +0100 |
---|---|---|
committer | MerryMage <MerryMage@users.noreply.github.com> | 2018-03-24 10:02:19 +0100 |
commit | 88c9608eacd2851ecbe9ceb634a64309789108e7 (patch) | |
tree | c395ba2775c49754ef05222d2bb097131412d0d6 /src/core/arm/dynarmic | |
parent | Merge pull request #274 from Subv/viewport_regs (diff) | |
download | yuzu-88c9608eacd2851ecbe9ceb634a64309789108e7.tar yuzu-88c9608eacd2851ecbe9ceb634a64309789108e7.tar.gz yuzu-88c9608eacd2851ecbe9ceb634a64309789108e7.tar.bz2 yuzu-88c9608eacd2851ecbe9ceb634a64309789108e7.tar.lz yuzu-88c9608eacd2851ecbe9ceb634a64309789108e7.tar.xz yuzu-88c9608eacd2851ecbe9ceb634a64309789108e7.tar.zst yuzu-88c9608eacd2851ecbe9ceb634a64309789108e7.zip |
Diffstat (limited to 'src/core/arm/dynarmic')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 7d83f9717..6afad0e0c 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -86,21 +86,17 @@ public: } void AddTicks(u64 ticks) override { - if (ticks > ticks_remaining) { - ticks_remaining = 0; - return; - } - ticks -= ticks_remaining; + CoreTiming::AddTicks(ticks - num_interpreted_instructions); + num_interpreted_instructions = 0; } u64 GetTicksRemaining() override { - return ticks_remaining; + return std::max(CoreTiming::GetDowncount(), 0); } u64 GetCNTPCT() override { return CoreTiming::GetTicks(); } ARM_Dynarmic& parent; - size_t ticks_remaining = 0; size_t num_interpreted_instructions = 0; u64 tpidrro_el0 = 0; u64 tpidr_el0 = 0; |