summaryrefslogtreecommitdiff
path: root/src/core/arm
diff options
context:
space:
mode:
authorGravatar bunnei2020-02-14 14:40:20 -0500
committerGravatar GitHub2020-02-14 14:40:20 -0500
commitf552d553bac1374c583d748dad27f8c86e86c4a0 (patch)
tree1da4aa037ff417fa4fd43bffac267dcb2b55a72d /src/core/arm
parentMerge pull request #3379 from ReinUsesLisp/cbuf-offset (diff)
parentCore: Correct compilition in GCC (diff)
downloadyuzu-f552d553bac1374c583d748dad27f8c86e86c4a0.tar.gz
yuzu-f552d553bac1374c583d748dad27f8c86e86c4a0.tar.xz
yuzu-f552d553bac1374c583d748dad27f8c86e86c4a0.zip
Merge pull request #3401 from FernandoS27/synchronization
Set of refactors for Kernel Synchronization and Hardware Constants
Diffstat (limited to 'src/core/arm')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp
index 791640a3a..29eaf74e5 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic.cpp
@@ -14,6 +14,7 @@
14#include "core/core_timing.h" 14#include "core/core_timing.h"
15#include "core/core_timing_util.h" 15#include "core/core_timing_util.h"
16#include "core/gdbstub/gdbstub.h" 16#include "core/gdbstub/gdbstub.h"
17#include "core/hardware_properties.h"
17#include "core/hle/kernel/process.h" 18#include "core/hle/kernel/process.h"
18#include "core/hle/kernel/scheduler.h" 19#include "core/hle/kernel/scheduler.h"
19#include "core/hle/kernel/svc.h" 20#include "core/hle/kernel/svc.h"
@@ -153,7 +154,7 @@ std::unique_ptr<Dynarmic::A64::Jit> ARM_Dynarmic::MakeJit(Common::PageTable& pag
153 config.tpidr_el0 = &cb->tpidr_el0; 154 config.tpidr_el0 = &cb->tpidr_el0;
154 config.dczid_el0 = 4; 155 config.dczid_el0 = 4;
155 config.ctr_el0 = 0x8444c004; 156 config.ctr_el0 = 0x8444c004;
156 config.cntfrq_el0 = Timing::CNTFREQ; 157 config.cntfrq_el0 = Hardware::CNTFREQ;
157 158
158 // Unpredictable instructions 159 // Unpredictable instructions
159 config.define_unpredictable_behaviour = true; 160 config.define_unpredictable_behaviour = true;