diff options
| author | bunnei <bunneidev@gmail.com> | 2018-02-18 20:52:09 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-02-18 20:52:09 +0100 |
| commit | 2d4a6883bcfa785e990c5dbf3fab9eb73a0ed277 (patch) | |
| tree | f5d63b13728e8b235e8620a015d3f48e34a0904d /src/core | |
| parent | kernel: Remove unused address_arbiter code. (diff) | |
| download | yuzu-2d4a6883bcfa785e990c5dbf3fab9eb73a0ed277.tar yuzu-2d4a6883bcfa785e990c5dbf3fab9eb73a0ed277.tar.gz yuzu-2d4a6883bcfa785e990c5dbf3fab9eb73a0ed277.tar.bz2 yuzu-2d4a6883bcfa785e990c5dbf3fab9eb73a0ed277.tar.lz yuzu-2d4a6883bcfa785e990c5dbf3fab9eb73a0ed277.tar.xz yuzu-2d4a6883bcfa785e990c5dbf3fab9eb73a0ed277.tar.zst yuzu-2d4a6883bcfa785e990c5dbf3fab9eb73a0ed277.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core.cpp | 6 | ||||
| -rw-r--r-- | src/core/core.h | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 613a98b4c..89bb2887e 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -141,14 +141,14 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { switch (Settings::values.cpu_core) { case Settings::CpuCore::Unicorn: - cpu_core = std::make_unique<ARM_Unicorn>(); + cpu_core = std::make_shared<ARM_Unicorn>(); break; case Settings::CpuCore::Dynarmic: default: #ifdef ARCHITECTURE_x86_64 - cpu_core = std::make_unique<ARM_Dynarmic>(); + cpu_core = std::make_shared<ARM_Dynarmic>(); #else - cpu_core = std::make_unique<ARM_Unicorn>(); + cpu_core = std::make_shared<ARM_Unicorn>(); LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available"); #endif break; diff --git a/src/core/core.h b/src/core/core.h index f63cc47cc..e7599e18c 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -140,9 +140,7 @@ private: /// AppLoader used to load the current executing application std::unique_ptr<Loader::AppLoader> app_loader; - ///< ARM11 CPU core - std::unique_ptr<ARM_Interface> cpu_core; - + std::shared_ptr<ARM_Interface> cpu_core; std::unique_ptr<Tegra::GPU> gpu_core; /// When true, signals that a reschedule should happen |