Browse Source

core/arm: fix build error

nce_cpp
Liam 3 years ago
parent
commit
a7027fa7c9
  1. 6
      src/core/arm/dynarmic/arm_dynarmic_32.cpp
  2. 6
      src/core/arm/dynarmic/arm_dynarmic_64.cpp

6
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{};

6
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;

Loading…
Cancel
Save