summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar MerryMage2018-01-12 16:06:30 +0000
committerGravatar bunnei2018-01-12 17:48:52 -0500
commitb628192bf27c871af3ecbf8982b4a13a78fd70c4 (patch)
treea5d66996675378584d2324c48c8e3ef4c8f33a74 /src/core/core.cpp
parentarm_dynarmic: Implement core (diff)
downloadyuzu-b628192bf27c871af3ecbf8982b4a13a78fd70c4.tar.gz
yuzu-b628192bf27c871af3ecbf8982b4a13a78fd70c4.tar.xz
yuzu-b628192bf27c871af3ecbf8982b4a13a78fd70c4.zip
configuration: Add cpu_core configuration option
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 0240f946b..e5f299f26 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -140,8 +140,16 @@ void System::Reschedule() {
140System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { 140System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
141 LOG_DEBUG(HW_Memory, "initialized OK"); 141 LOG_DEBUG(HW_Memory, "initialized OK");
142 142
143 // TODO: Configuration option 143 switch (Settings::values.cpu_core) {
144 cpu_core = std::make_unique<ARM_Dynarmic>(); 144 case Settings::CpuCore::Unicorn:
145 cpu_core = std::make_unique<ARM_Unicorn>();
146 break;
147 case Settings::CpuCore::Dynarmic:
148 default:
149 cpu_core = std::make_unique<ARM_Dynarmic>();
150 break;
151 }
152
145 telemetry_session = std::make_unique<Core::TelemetrySession>(); 153 telemetry_session = std::make_unique<Core::TelemetrySession>();
146 154
147 CoreTiming::Init(); 155 CoreTiming::Init();