diff options
| author | bunnei <bunneidev@gmail.com> | 2016-09-02 05:18:01 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-09-15 23:49:27 +0200 |
| commit | 14085ec670330b72d897d19ee844da87402ef39c (patch) | |
| tree | 9333fe92f18a558da45ca0c4eb3444f026fb23e7 /src/core/core.cpp | |
| parent | dynarmic: Implement ARM CPU interface. (diff) | |
| download | yuzu-14085ec670330b72d897d19ee844da87402ef39c.tar yuzu-14085ec670330b72d897d19ee844da87402ef39c.tar.gz yuzu-14085ec670330b72d897d19ee844da87402ef39c.tar.bz2 yuzu-14085ec670330b72d897d19ee844da87402ef39c.tar.lz yuzu-14085ec670330b72d897d19ee844da87402ef39c.tar.xz yuzu-14085ec670330b72d897d19ee844da87402ef39c.tar.zst yuzu-14085ec670330b72d897d19ee844da87402ef39c.zip | |
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index cabab744a..a3834adae 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"); } |