diff options
| author | bunnei <bunneidev@gmail.com> | 2019-07-11 20:56:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 20:56:26 +0200 |
| commit | 521fb325aaabf46f1f1586120a1233dc2ad5df69 (patch) | |
| tree | 0d17ea4ab98dbf2e9ed17faa022b689d858a752f /src/core/core_cpu.cpp | |
| parent | Merge pull request #2724 from lioncash/sleep (diff) | |
| parent | yuzu: Remove setting for using Unicorn (diff) | |
| download | yuzu-521fb325aaabf46f1f1586120a1233dc2ad5df69.tar yuzu-521fb325aaabf46f1f1586120a1233dc2ad5df69.tar.gz yuzu-521fb325aaabf46f1f1586120a1233dc2ad5df69.tar.bz2 yuzu-521fb325aaabf46f1f1586120a1233dc2ad5df69.tar.lz yuzu-521fb325aaabf46f1f1586120a1233dc2ad5df69.tar.xz yuzu-521fb325aaabf46f1f1586120a1233dc2ad5df69.tar.zst yuzu-521fb325aaabf46f1f1586120a1233dc2ad5df69.zip | |
Diffstat (limited to 'src/core/core_cpu.cpp')
| -rw-r--r-- | src/core/core_cpu.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp index 99b7d387d..21c410e34 100644 --- a/src/core/core_cpu.cpp +++ b/src/core/core_cpu.cpp @@ -53,16 +53,12 @@ bool CpuBarrier::Rendezvous() { Cpu::Cpu(System& system, ExclusiveMonitor& exclusive_monitor, CpuBarrier& cpu_barrier, std::size_t core_index) : cpu_barrier{cpu_barrier}, core_timing{system.CoreTiming()}, core_index{core_index} { - if (Settings::values.cpu_jit_enabled) { #ifdef ARCHITECTURE_x86_64 - arm_interface = std::make_unique<ARM_Dynarmic>(system, exclusive_monitor, core_index); + arm_interface = std::make_unique<ARM_Dynarmic>(system, exclusive_monitor, core_index); #else - arm_interface = std::make_unique<ARM_Unicorn>(system); - LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available"); + arm_interface = std::make_unique<ARM_Unicorn>(system); + LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available"); #endif - } else { - arm_interface = std::make_unique<ARM_Unicorn>(system); - } scheduler = std::make_unique<Kernel::Scheduler>(system, *arm_interface); } @@ -70,15 +66,12 @@ Cpu::Cpu(System& system, ExclusiveMonitor& exclusive_monitor, CpuBarrier& cpu_ba Cpu::~Cpu() = default; std::unique_ptr<ExclusiveMonitor> Cpu::MakeExclusiveMonitor(std::size_t num_cores) { - if (Settings::values.cpu_jit_enabled) { #ifdef ARCHITECTURE_x86_64 - return std::make_unique<DynarmicExclusiveMonitor>(num_cores); + return std::make_unique<DynarmicExclusiveMonitor>(num_cores); #else - return nullptr; // TODO(merry): Passthrough exclusive monitor + // TODO(merry): Passthrough exclusive monitor + return nullptr; #endif - } else { - return nullptr; // TODO(merry): Passthrough exclusive monitor - } } void Cpu::RunLoop(bool tight_loop) { |