VERY experimental Nintendo Switch 2 emulator
C++
core/arm: fix build error
Liama7027fa7c9c4
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cppindex 2e0e16b6e7..1638bc41db 100644--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp@@ -144,7 +144,7 @@ public:u64 GetTicksRemaining() override {if (parent.uses_wall_clock) {- if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) {+ if (!IsInterrupted()) {return minimum_run_cycles;}return 0U;@@ -174,6 +174,10 @@ public:parent.jit.load()->HaltExecution(hr);}+ bool IsInterrupted() {+ return parent.system.Kernel().PhysicalCore(parent.core_index).IsInterrupted();+ }+ARM_Dynarmic_32& parent;Core::Memory::Memory& memory;std::size_t num_interpreted_instructions{};diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cppindex bf971b7dcb..921a5a7341 100644--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp@@ -183,7 +183,7 @@ public:u64 GetTicksRemaining() override {if (parent.uses_wall_clock) {- if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) {+ if (!IsInterrupted()) {return minimum_run_cycles;}return 0U;@@ -217,6 +217,10 @@ public:parent.jit.load()->HaltExecution(hr);}+ bool IsInterrupted() {+ return parent.system.Kernel().PhysicalCore(parent.core_index).IsInterrupted();+ }+ARM_Dynarmic_64& parent;Core::Memory::Memory& memory;u64 tpidrro_el0 = 0;