Browse Source
Merge pull request #8734 from liamwhite/bors-is-my-best-friend
core/arm: fix build error
pull/15/merge
bunnei
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
10 additions and
2 deletions
-
src/core/arm/dynarmic/arm_dynarmic_32.cpp
-
src/core/arm/dynarmic/arm_dynarmic_64.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{}; |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|