diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-02-29 18:58:50 +0100 |
---|---|---|
committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-06-27 17:35:56 +0200 |
commit | 1b82ccec2220a69711ba75cf51ee98cbcfe6a510 (patch) | |
tree | 281ad19080ec4e6e14caa50b073acdfac005212b /src/core/arm/dynarmic/arm_dynarmic_32.cpp | |
parent | X64 Clock: Reduce accuracy to be less or equal to guest accuracy. (diff) | |
download | yuzu-1b82ccec2220a69711ba75cf51ee98cbcfe6a510.tar yuzu-1b82ccec2220a69711ba75cf51ee98cbcfe6a510.tar.gz yuzu-1b82ccec2220a69711ba75cf51ee98cbcfe6a510.tar.bz2 yuzu-1b82ccec2220a69711ba75cf51ee98cbcfe6a510.tar.lz yuzu-1b82ccec2220a69711ba75cf51ee98cbcfe6a510.tar.xz yuzu-1b82ccec2220a69711ba75cf51ee98cbcfe6a510.tar.zst yuzu-1b82ccec2220a69711ba75cf51ee98cbcfe6a510.zip |
Diffstat (limited to 'src/core/arm/dynarmic/arm_dynarmic_32.cpp')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_32.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index c8a1ce6e7..f36c5f401 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -76,7 +76,7 @@ public: } u64 GetTicksRemaining() override { - if (!parent.interrupt_handler.IsInterrupted()) { + if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) { return std::max<s64>(ticks, 0); } return 0ULL; @@ -111,9 +111,9 @@ void ARM_Dynarmic_32::Step() { jit->Step(); } -ARM_Dynarmic_32::ARM_Dynarmic_32(System& system, CPUInterruptHandler& interrupt_handler, +ARM_Dynarmic_32::ARM_Dynarmic_32(System& system, CPUInterrupts& interrupt_handlers, ExclusiveMonitor& exclusive_monitor, std::size_t core_index) - : ARM_Interface{system, interrupt_handler}, cb(std::make_unique<DynarmicCallbacks32>(*this)), + : ARM_Interface{system, interrupt_handlers}, cb(std::make_unique<DynarmicCallbacks32>(*this)), cp15(std::make_shared<DynarmicCP15>(*this)), core_index{core_index}, exclusive_monitor{dynamic_cast<DynarmicExclusiveMonitor&>(exclusive_monitor)} {} |