diff options
author | bunnei <bunneidev@gmail.com> | 2019-02-13 01:26:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-13 01:26:37 +0100 |
commit | 8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4 (patch) | |
tree | 83c843cf14d53a45ed5aad3d60b00cecb9e6d20e /src/core/arm/dynarmic/arm_dynarmic.cpp | |
parent | Merge pull request #2104 from ReinUsesLisp/compute-assert (diff) | |
parent | core_timing: Rename CoreTiming namespace to Core::Timing (diff) | |
download | yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.gz yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.bz2 yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.lz yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.xz yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.zst yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.zip |
Diffstat (limited to 'src/core/arm/dynarmic/arm_dynarmic.cpp')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index afbda8d8b..f28951f8a 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -112,14 +112,14 @@ public: // Always execute at least one tick. amortized_ticks = std::max<u64>(amortized_ticks, 1); - CoreTiming::AddTicks(amortized_ticks); + Timing::AddTicks(amortized_ticks); num_interpreted_instructions = 0; } u64 GetTicksRemaining() override { - return std::max(CoreTiming::GetDowncount(), 0); + return std::max(Timing::GetDowncount(), 0); } u64 GetCNTPCT() override { - return CoreTiming::GetTicks(); + return Timing::GetTicks(); } ARM_Dynarmic& parent; |