summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar MerryMage2018-01-09 21:33:46 +0000
committerGravatar bunnei2018-01-12 17:48:29 -0500
commitd2fbc7832080955598c9fb6f083414eca47f0f19 (patch)
tree4f4b63aa2d37b86c39fdd17b12731bceda8bc90c /src/core/core.cpp
parentcore: Include <algorithm> where used. (diff)
downloadyuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar.gz
yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar.xz
yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.zip
arm_dynarmic: Implement core
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 40ef58f59..0240f946b 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -6,6 +6,7 @@
6#include <utility> 6#include <utility>
7#include "audio_core/audio_core.h" 7#include "audio_core/audio_core.h"
8#include "common/logging/log.h" 8#include "common/logging/log.h"
9#include "core/arm/dynarmic/arm_dynarmic.h"
9#include "core/arm/unicorn/arm_unicorn.h" 10#include "core/arm/unicorn/arm_unicorn.h"
10#include "core/core.h" 11#include "core/core.h"
11#include "core/core_timing.h" 12#include "core/core_timing.h"
@@ -139,7 +140,8 @@ void System::Reschedule() {
139System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { 140System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
140 LOG_DEBUG(HW_Memory, "initialized OK"); 141 LOG_DEBUG(HW_Memory, "initialized OK");
141 142
142 cpu_core = std::make_unique<ARM_Unicorn>(); 143 // TODO: Configuration option
144 cpu_core = std::make_unique<ARM_Dynarmic>();
143 telemetry_session = std::make_unique<Core::TelemetrySession>(); 145 telemetry_session = std::make_unique<Core::TelemetrySession>();
144 146
145 CoreTiming::Init(); 147 CoreTiming::Init();