diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-02-15 18:15:28 +0100 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2019-02-16 03:55:29 +0100 |
commit | 5b7ec71fb7cc81ea0f98f019cb0dac0b6bcb2fa2 (patch) | |
tree | f4bd6af64dd1200dd12a4dd9e55f4920b8a8a8cf /src/core/arm/dynarmic/arm_dynarmic.cpp | |
parent | Merge pull request #2123 from lioncash/coretiming-global (diff) | |
download | yuzu-5b7ec71fb7cc81ea0f98f019cb0dac0b6bcb2fa2.tar yuzu-5b7ec71fb7cc81ea0f98f019cb0dac0b6bcb2fa2.tar.gz yuzu-5b7ec71fb7cc81ea0f98f019cb0dac0b6bcb2fa2.tar.bz2 yuzu-5b7ec71fb7cc81ea0f98f019cb0dac0b6bcb2fa2.tar.lz yuzu-5b7ec71fb7cc81ea0f98f019cb0dac0b6bcb2fa2.tar.xz yuzu-5b7ec71fb7cc81ea0f98f019cb0dac0b6bcb2fa2.tar.zst yuzu-5b7ec71fb7cc81ea0f98f019cb0dac0b6bcb2fa2.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 9b7ca4030..d36538257 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -12,6 +12,7 @@ #include "core/core.h" #include "core/core_cpu.h" #include "core/core_timing.h" +#include "core/core_timing_util.h" #include "core/gdbstub/gdbstub.h" #include "core/hle/kernel/process.h" #include "core/hle/kernel/svc.h" @@ -119,7 +120,7 @@ public: return std::max(parent.core_timing.GetDowncount(), 0); } u64 GetCNTPCT() override { - return parent.core_timing.GetTicks(); + return CpuCyclesToClockCycles(parent.core_timing.GetTicks()); } ARM_Dynarmic& parent; @@ -151,7 +152,7 @@ std::unique_ptr<Dynarmic::A64::Jit> ARM_Dynarmic::MakeJit() const { config.tpidr_el0 = &cb->tpidr_el0; config.dczid_el0 = 4; config.ctr_el0 = 0x8444c004; - config.cntfrq_el0 = 19200000; // Value from fusee. + config.cntfrq_el0 = Timing::CNTFREQ; // Value from fusee. // Unpredictable instructions config.define_unpredictable_behaviour = true; |