diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2018-01-09 21:33:46 +0000 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-01-12 17:48:29 -0500 |
| commit | d2fbc7832080955598c9fb6f083414eca47f0f19 (patch) | |
| tree | 4f4b63aa2d37b86c39fdd17b12731bceda8bc90c /src/core/core.cpp | |
| parent | 056f987bcd7563dfc07f6eb3dbe4543779328c55 (diff) | |
arm_dynarmic: Implement core
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 40ef58f59e..0240f946ba 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -6,6 +6,7 @@ #include <utility> #include "audio_core/audio_core.h" #include "common/logging/log.h" +#include "core/arm/dynarmic/arm_dynarmic.h" #include "core/arm/unicorn/arm_unicorn.h" #include "core/core.h" #include "core/core_timing.h" @@ -139,7 +140,8 @@ void System::Reschedule() { System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { LOG_DEBUG(HW_Memory, "initialized OK"); - cpu_core = std::make_unique<ARM_Unicorn>(); + // TODO: Configuration option + cpu_core = std::make_unique<ARM_Dynarmic>(); telemetry_session = std::make_unique<Core::TelemetrySession>(); CoreTiming::Init(); |