diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-03-06 19:56:05 +0100 |
---|---|---|
committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-06-27 17:35:29 +0200 |
commit | a33fbaddec5d516328d7cd179114dcf0b93cfb69 (patch) | |
tree | 3c4a4ffaae67165e5d4fc380c3f6f899d73f8dac /src/core/arm/dynarmic/arm_dynarmic_32.cpp | |
parent | Scheduler: Release old thread fiber before trying to switch to the next thread fiber. (diff) | |
download | yuzu-a33fbaddec5d516328d7cd179114dcf0b93cfb69.tar yuzu-a33fbaddec5d516328d7cd179114dcf0b93cfb69.tar.gz yuzu-a33fbaddec5d516328d7cd179114dcf0b93cfb69.tar.bz2 yuzu-a33fbaddec5d516328d7cd179114dcf0b93cfb69.tar.lz yuzu-a33fbaddec5d516328d7cd179114dcf0b93cfb69.tar.xz yuzu-a33fbaddec5d516328d7cd179114dcf0b93cfb69.tar.zst yuzu-a33fbaddec5d516328d7cd179114dcf0b93cfb69.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_32.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index 0b7aa6a69..30bf62ac1 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -8,6 +8,7 @@ #include <dynarmic/A32/config.h> #include <dynarmic/A32/context.h> #include "common/microprofile.h" +#include "core/arm/cpu_interrupt_handler.h" #include "core/arm/dynarmic/arm_dynarmic_32.h" #include "core/arm/dynarmic/arm_dynarmic_64.h" #include "core/arm/dynarmic/arm_dynarmic_cp15.h" @@ -72,20 +73,13 @@ public: } void AddTicks(u64 ticks) override { - // Divide the number of ticks by the amount of CPU cores. TODO(Subv): This yields only a - // rough approximation of the amount of executed ticks in the system, it may be thrown off - // if not all cores are doing a similar amount of work. Instead of doing this, we should - // device a way so that timing is consistent across all cores without increasing the ticks 4 - // times. - u64 amortized_ticks = (ticks - num_interpreted_instructions) / Core::NUM_CPU_CORES; - // Always execute at least one tick. - amortized_ticks = std::max<u64>(amortized_ticks, 1); - - parent.system.CoreTiming().AddTicks(amortized_ticks); - num_interpreted_instructions = 0; + /// We are using host timing, NOP } u64 GetTicksRemaining() override { - return std::max(parent.system.CoreTiming().GetDowncount(), {}); + if (!parent.interrupt_handler.IsInterrupted()) { + return 1000ULL; + } + return 0ULL; } ARM_Dynarmic_32& parent; |