diff options
| author |  MerryMage | 2016-11-26 20:32:33 +0000 |
|---|---|---|
| committer | MerryMage | 2016-11-26 20:32:33 +0000 |
| commit | 27be446049cf09f2025451d53eb6c49597cf097b (patch) | |
| tree | 60a6e84ea7a8364615a010d7cdc06fafe3c77334 /src | |
| parent | Merge pull request #2210 from jroweboy/pagetables (diff) | |
| download | yuzu-27be446049cf09f2025451d53eb6c49597cf097b.tar.gz yuzu-27be446049cf09f2025451d53eb6c49597cf097b.tar.xz yuzu-27be446049cf09f2025451d53eb6c49597cf097b.zip | |
dynarmic: Add ticks based on ticks executed, not ticks requested
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 2595defdf..ca8a94ee9 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp | |||
| @@ -131,9 +131,9 @@ MICROPROFILE_DEFINE(ARM_Jit, "ARM JIT", "ARM JIT", MP_RGB(255, 64, 64)); | |||
| 131 | void ARM_Dynarmic::ExecuteInstructions(int num_instructions) { | 131 | void ARM_Dynarmic::ExecuteInstructions(int num_instructions) { |
| 132 | MICROPROFILE_SCOPE(ARM_Jit); | 132 | MICROPROFILE_SCOPE(ARM_Jit); |
| 133 | 133 | ||
| 134 | jit->Run(static_cast<unsigned>(num_instructions)); | 134 | unsigned ticks_executed = jit->Run(static_cast<unsigned>(num_instructions)); |
| 135 | 135 | ||
| 136 | AddTicks(num_instructions); | 136 | AddTicks(ticks_executed); |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | void ARM_Dynarmic::SaveContext(Core::ThreadContext& ctx) { | 139 | void ARM_Dynarmic::SaveContext(Core::ThreadContext& ctx) { |