summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-03-26 23:01:40 -0400
committerGravatar bunnei2018-03-26 23:02:37 -0400
commit94f4009c3be4c7f69eda8af1cb0139dccd5bffa5 (patch)
tree170c0dad6412df2d55594593de65460ed56b5c45 /src/core/core.cpp
parentconfig: Rename is_docked to use_docked_mode to be consistent with other confi... (diff)
downloadyuzu-94f4009c3be4c7f69eda8af1cb0139dccd5bffa5.tar.gz
yuzu-94f4009c3be4c7f69eda8af1cb0139dccd5bffa5.tar.xz
yuzu-94f4009c3be4c7f69eda8af1cb0139dccd5bffa5.zip
config: Use simplified checkbox (from Citra) for CPU JIT.
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index d55621de8..11654d4da 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -148,19 +148,15 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
148 148
149 current_process = Kernel::Process::Create("main"); 149 current_process = Kernel::Process::Create("main");
150 150
151 switch (Settings::values.cpu_core) { 151 if (Settings::values.use_cpu_jit) {
152 case Settings::CpuCore::Unicorn:
153 cpu_core = std::make_shared<ARM_Unicorn>();
154 break;
155 case Settings::CpuCore::Dynarmic:
156 default:
157#ifdef ARCHITECTURE_x86_64 152#ifdef ARCHITECTURE_x86_64
158 cpu_core = std::make_shared<ARM_Dynarmic>(); 153 cpu_core = std::make_shared<ARM_Dynarmic>();
159#else 154#else
160 cpu_core = std::make_shared<ARM_Unicorn>(); 155 cpu_core = std::make_shared<ARM_Unicorn>();
161 LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available"); 156 LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available");
162#endif 157#endif
163 break; 158 } else {
159 cpu_core = std::make_shared<ARM_Unicorn>();
164 } 160 }
165 161
166 gpu_core = std::make_unique<Tegra::GPU>(); 162 gpu_core = std::make_unique<Tegra::GPU>();