summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2016-11-26 22:51:11 +0100
committerGitHub <noreply@github.com>2016-11-26 22:51:11 +0100
commitb230913c2bd52aae69c536b7e8e9868132468d69 (patch)
tree60a6e84ea7a8364615a010d7cdc06fafe3c77334
parentMerge pull request #2210 from jroweboy/pagetables (diff)
parentdynarmic: Add ticks based on ticks executed, not ticks requested (diff)
downloadyuzu-b230913c2bd52aae69c536b7e8e9868132468d69.tar
yuzu-b230913c2bd52aae69c536b7e8e9868132468d69.tar.gz
yuzu-b230913c2bd52aae69c536b7e8e9868132468d69.tar.bz2
yuzu-b230913c2bd52aae69c536b7e8e9868132468d69.tar.lz
yuzu-b230913c2bd52aae69c536b7e8e9868132468d69.tar.xz
yuzu-b230913c2bd52aae69c536b7e8e9868132468d69.tar.zst
yuzu-b230913c2bd52aae69c536b7e8e9868132468d69.zip
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.cpp4
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));
void ARM_Dynarmic::ExecuteInstructions(int num_instructions) {
MICROPROFILE_SCOPE(ARM_Jit);
- jit->Run(static_cast<unsigned>(num_instructions));
+ unsigned ticks_executed = jit->Run(static_cast<unsigned>(num_instructions));
- AddTicks(num_instructions);
+ AddTicks(ticks_executed);
}
void ARM_Dynarmic::SaveContext(Core::ThreadContext& ctx) {