From d2fbc7832080955598c9fb6f083414eca47f0f19 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Tue, 9 Jan 2018 21:33:46 +0000
Subject: arm_dynarmic: Implement core
---
src/core/core.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'src/core/core.cpp')
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();
--
cgit v1.2.3-70-g09d2