summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2015-01-31 20:34:26 -0500
committerGravatar Lioncash2015-01-31 20:43:03 -0500
commitf44781fd7b0c5f99573e917ccdd92716a99a9b0d (patch)
treead31575f5653316488371cd654d961ce803e2c01 /src/core/core.cpp
parentMerge pull request #512 from lioncash/assignment (diff)
downloadyuzu-f44781fd7b0c5f99573e917ccdd92716a99a9b0d.tar.gz
yuzu-f44781fd7b0c5f99573e917ccdd92716a99a9b0d.tar.xz
yuzu-f44781fd7b0c5f99573e917ccdd92716a99a9b0d.zip
arm: Adios armemu
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index e9e5c35cc..63be27be2 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -10,7 +10,6 @@
10#include "core/settings.h" 10#include "core/settings.h"
11#include "core/arm/arm_interface.h" 11#include "core/arm/arm_interface.h"
12#include "core/arm/disassembler/arm_disasm.h" 12#include "core/arm/disassembler/arm_disasm.h"
13#include "core/arm/interpreter/arm_interpreter.h"
14#include "core/arm/dyncom/arm_dyncom.h" 13#include "core/arm/dyncom/arm_dyncom.h"
15#include "core/hle/hle.h" 14#include "core/hle/hle.h"
16#include "core/hle/kernel/thread.h" 15#include "core/hle/kernel/thread.h"
@@ -59,17 +58,8 @@ void Stop() {
59int Init() { 58int Init() {
60 LOG_DEBUG(Core, "initialized OK"); 59 LOG_DEBUG(Core, "initialized OK");
61 60
62 g_sys_core = new ARM_Interpreter(); 61 g_sys_core = new ARM_DynCom();
63 62 g_app_core = new ARM_DynCom();
64 switch (Settings::values.cpu_core) {
65 case CPU_Interpreter:
66 g_app_core = new ARM_DynCom();
67 break;
68 case CPU_OldInterpreter:
69 default:
70 g_app_core = new ARM_Interpreter();
71 break;
72 }
73 63
74 return 0; 64 return 0;
75} 65}