From 14085ec670330b72d897d19ee844da87402ef39c Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Thu, 1 Sep 2016 23:18:01 -0400
Subject: core: Add configuration option for CPU JIT.
---
src/core/core.cpp | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
(limited to 'src/core/core.cpp')
diff --git a/src/core/core.cpp b/src/core/core.cpp
index cabab744ad..a3834adae6 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -6,16 +6,16 @@
#include "common/logging/log.h"
-#include "core/core.h"
-#include "core/core_timing.h"
-
#include "core/arm/arm_interface.h"
+#include "core/arm/dynarmic/arm_dynarmic.h"
#include "core/arm/dyncom/arm_dyncom.h"
+#include "core/core.h"
+#include "core/core_timing.h"
+#include "core/gdbstub/gdbstub.h"
#include "core/hle/hle.h"
#include "core/hle/kernel/thread.h"
#include "core/hw/hw.h"
-
-#include "core/gdbstub/gdbstub.h"
+#include "core/settings.h"
namespace Core {
@@ -73,8 +73,13 @@ void Stop() {
/// Initialize the core
void Init() {
- g_sys_core = std::make_unique<ARM_DynCom>(USER32MODE);
- g_app_core = std::make_unique<ARM_DynCom>(USER32MODE);
+ if (Settings::values.use_cpu_jit) {
+ g_sys_core = std::make_unique<ARM_Dynarmic>(USER32MODE);
+ g_app_core = std::make_unique<ARM_Dynarmic>(USER32MODE);
+ } else {
+ g_sys_core = std::make_unique<ARM_DynCom>(USER32MODE);
+ g_app_core = std::make_unique<ARM_DynCom>(USER32MODE);
+ }
LOG_DEBUG(Core, "Initialized OK");
}
--
cgit v1.2.3-70-g09d2