diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2018-01-12 16:06:30 +0000 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-01-12 17:48:52 -0500 |
| commit | b628192bf27c871af3ecbf8982b4a13a78fd70c4 (patch) | |
| tree | a5d66996675378584d2324c48c8e3ef4c8f33a74 /src/core/core.cpp | |
| parent | d2fbc7832080955598c9fb6f083414eca47f0f19 (diff) | |
configuration: Add cpu_core configuration option
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 0240f946ba..e5f299f268 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -140,8 +140,16 @@ void System::Reschedule() { System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { LOG_DEBUG(HW_Memory, "initialized OK"); - // TODO: Configuration option - cpu_core = std::make_unique<ARM_Dynarmic>(); + switch (Settings::values.cpu_core) { + case Settings::CpuCore::Unicorn: + cpu_core = std::make_unique<ARM_Unicorn>(); + break; + case Settings::CpuCore::Dynarmic: + default: + cpu_core = std::make_unique<ARM_Dynarmic>(); + break; + } + telemetry_session = std::make_unique<Core::TelemetrySession>(); CoreTiming::Init(); |