summaryrefslogtreecommitdiff
path: root/src/core/core_cpu.cpp
diff options
context:
space:
mode:
authorGravatar Zach Hilman2019-07-04 15:33:59 -0400
committerGravatar GitHub2019-07-04 15:33:59 -0400
commit3f3a93f13b70959b6ba57b22bf8851b5c88929d4 (patch)
tree80e10cc0c85a02d82392b103b51c0e1d94d2adaf /src/core/core_cpu.cpp
parentMerge pull request #2555 from lioncash/tls (diff)
parentyuzu: Remove CPU Jit setting from the UI (diff)
downloadyuzu-3f3a93f13b70959b6ba57b22bf8851b5c88929d4.tar.gz
yuzu-3f3a93f13b70959b6ba57b22bf8851b5c88929d4.tar.xz
yuzu-3f3a93f13b70959b6ba57b22bf8851b5c88929d4.zip
Merge pull request #2669 from FearlessTobi/move-cpujit-setting
yuzu: Move CPU Jit setting to Debug tab
Diffstat (limited to 'src/core/core_cpu.cpp')
-rw-r--r--src/core/core_cpu.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp
index ba63c3e61..99b7d387d 100644
--- a/src/core/core_cpu.cpp
+++ b/src/core/core_cpu.cpp
@@ -53,7 +53,7 @@ bool CpuBarrier::Rendezvous() {
53Cpu::Cpu(System& system, ExclusiveMonitor& exclusive_monitor, CpuBarrier& cpu_barrier, 53Cpu::Cpu(System& system, ExclusiveMonitor& exclusive_monitor, CpuBarrier& cpu_barrier,
54 std::size_t core_index) 54 std::size_t core_index)
55 : cpu_barrier{cpu_barrier}, core_timing{system.CoreTiming()}, core_index{core_index} { 55 : cpu_barrier{cpu_barrier}, core_timing{system.CoreTiming()}, core_index{core_index} {
56 if (Settings::values.use_cpu_jit) { 56 if (Settings::values.cpu_jit_enabled) {
57#ifdef ARCHITECTURE_x86_64 57#ifdef ARCHITECTURE_x86_64
58 arm_interface = std::make_unique<ARM_Dynarmic>(system, exclusive_monitor, core_index); 58 arm_interface = std::make_unique<ARM_Dynarmic>(system, exclusive_monitor, core_index);
59#else 59#else
@@ -70,7 +70,7 @@ Cpu::Cpu(System& system, ExclusiveMonitor& exclusive_monitor, CpuBarrier& cpu_ba
70Cpu::~Cpu() = default; 70Cpu::~Cpu() = default;
71 71
72std::unique_ptr<ExclusiveMonitor> Cpu::MakeExclusiveMonitor(std::size_t num_cores) { 72std::unique_ptr<ExclusiveMonitor> Cpu::MakeExclusiveMonitor(std::size_t num_cores) {
73 if (Settings::values.use_cpu_jit) { 73 if (Settings::values.cpu_jit_enabled) {
74#ifdef ARCHITECTURE_x86_64 74#ifdef ARCHITECTURE_x86_64
75 return std::make_unique<DynarmicExclusiveMonitor>(num_cores); 75 return std::make_unique<DynarmicExclusiveMonitor>(num_cores);
76#else 76#else