diff options
| author | 2018-01-04 00:13:23 -0500 | |
|---|---|---|
| committer | 2018-01-04 00:13:23 -0500 | |
| commit | 3f8b9181b553e8af9bd93899832ddc2c8cf73e8b (patch) | |
| tree | 00df941867db6c14f172f6eb4ed99964ac3bc5b3 /src/core/core.cpp | |
| parent | DownloadExternals: Use yuzu repo. (diff) | |
| download | yuzu-3f8b9181b553e8af9bd93899832ddc2c8cf73e8b.tar.gz yuzu-3f8b9181b553e8af9bd93899832ddc2c8cf73e8b.tar.xz yuzu-3f8b9181b553e8af9bd93899832ddc2c8cf73e8b.zip | |
unicorn: Use for arm interface on Windows.
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 886cb0972..d7e2450ff 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -6,8 +6,6 @@ | |||
| 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/arm_interface.h" | ||
| 10 | #include "core/arm/dynarmic/arm_dynarmic.h" | ||
| 11 | #include "core/arm/unicorn/arm_unicorn.h" | 9 | #include "core/arm/unicorn/arm_unicorn.h" |
| 12 | #include "core/core.h" | 10 | #include "core/core.h" |
| 13 | #include "core/core_timing.h" | 11 | #include "core/core_timing.h" |
| @@ -140,12 +138,7 @@ void System::Reschedule() { | |||
| 140 | System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { | 138 | System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { |
| 141 | LOG_DEBUG(HW_Memory, "initialized OK"); | 139 | LOG_DEBUG(HW_Memory, "initialized OK"); |
| 142 | 140 | ||
| 143 | if (Settings::values.use_cpu_jit) { | 141 | cpu_core = std::make_unique<ARM_Unicorn>(); |
| 144 | cpu_core = std::make_unique<ARM_Dynarmic>(); | ||
| 145 | } else { | ||
| 146 | cpu_core = std::make_unique<ARM_Unicorn>(); | ||
| 147 | } | ||
| 148 | |||
| 149 | telemetry_session = std::make_unique<Core::TelemetrySession>(); | 142 | telemetry_session = std::make_unique<Core::TelemetrySession>(); |
| 150 | 143 | ||
| 151 | CoreTiming::Init(); | 144 | CoreTiming::Init(); |