VERY experimental Nintendo Switch 2 emulator
C++
core/arm: re-enable cycle counting
merry8151f68522e5
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cppindex 8c90c8be00..8ae16c4d99 100644--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp@@ -112,7 +112,9 @@ public:}void AddTicks(u64 ticks) override {- ASSERT_MSG(!parent.uses_wall_clock, "This should never happen - dynarmic ticking disabled");+ if (parent.uses_wall_clock) {+ return;+ }// 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@@ -129,7 +131,12 @@ public:}u64 GetTicksRemaining() override {- ASSERT_MSG(!parent.uses_wall_clock, "This should never happen - dynarmic ticking disabled");+ if (parent.uses_wall_clock) {+ if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) {+ return minimum_run_cycles;+ }+ return 0U;+ }return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0);}@@ -182,7 +189,7 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable*// Timingconfig.wall_clock_cntpct = uses_wall_clock;- config.enable_cycle_counting = !uses_wall_clock;+ config.enable_cycle_counting = true;// Code cache sizeconfig.code_cache_size = 512_MiB;diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cppindex 4370ca2945..ff25cfe163 100644--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp@@ -157,7 +157,9 @@ public:}void AddTicks(u64 ticks) override {- ASSERT_MSG(!parent.uses_wall_clock, "This should never happen - dynarmic ticking disabled");+ if (parent.uses_wall_clock) {+ return;+ }// 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@@ -172,7 +174,12 @@ public:}u64 GetTicksRemaining() override {- ASSERT_MSG(!parent.uses_wall_clock, "This should never happen - dynarmic ticking disabled");+ if (parent.uses_wall_clock) {+ if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) {+ return minimum_run_cycles;+ }+ return 0U;+ }return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0);}@@ -246,7 +253,7 @@ std::shared_ptr<Dynarmic::A64::Jit> ARM_Dynarmic_64::MakeJit(Common::PageTable*// Timingconfig.wall_clock_cntpct = uses_wall_clock;- config.enable_cycle_counting = !uses_wall_clock;+ config.enable_cycle_counting = true;// Code cache sizeconfig.code_cache_size = 512_MiB;