From 555866f8dcb98897688d5d7b0e6c6cca55ac069f Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Mon, 9 Sep 2019 21:37:29 -0400 Subject: Core Timing: Rework Core Timing to run all cores evenly. --- src/core/arm/dynarmic/arm_dynarmic.cpp | 2 +- src/core/arm/unicorn/arm_unicorn.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/arm') diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index f1506b372..4d2e99ed0 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -116,7 +116,7 @@ public: num_interpreted_instructions = 0; } u64 GetTicksRemaining() override { - return std::max(parent.system.CoreTiming().GetDowncount(), 0); + return std::max(parent.system.CoreTiming().GetDowncount(), 0LL); } u64 GetCNTPCT() override { return Timing::CpuCyclesToClockCycles(parent.system.CoreTiming().GetTicks()); diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp index 97d5c2a8a..3f91b06d4 100644 --- a/src/core/arm/unicorn/arm_unicorn.cpp +++ b/src/core/arm/unicorn/arm_unicorn.cpp @@ -156,7 +156,7 @@ void ARM_Unicorn::Run() { if (GDBStub::IsServerEnabled()) { ExecuteInstructions(std::max(4000000, 0)); } else { - ExecuteInstructions(std::max(system.CoreTiming().GetDowncount(), 0)); + ExecuteInstructions(std::max(system.CoreTiming().GetDowncount(), 0LL)); } } -- cgit v1.2.3