diff options
| author | 2019-04-11 21:50:05 -0400 | |
|---|---|---|
| committer | 2019-04-11 21:50:05 -0400 | |
| commit | 83a2fb3c3a1d75be6e4e01bdeeb1cc23293561ad (patch) | |
| tree | 2c5bac8e30d7dd7e6b660d3c4050f8838ef1d744 /src/core/core_cpu.cpp | |
| parent | Merge pull request #2388 from lioncash/constexpr (diff) | |
| parent | kernel/svc: Deglobalize the supervisor call handlers (diff) | |
| download | yuzu-83a2fb3c3a1d75be6e4e01bdeeb1cc23293561ad.tar.gz yuzu-83a2fb3c3a1d75be6e4e01bdeeb1cc23293561ad.tar.xz yuzu-83a2fb3c3a1d75be6e4e01bdeeb1cc23293561ad.zip | |
Merge pull request #2360 from lioncash/svc-global
kernel/svc: Deglobalize the supervisor call handlers
Diffstat (limited to 'src/core/core_cpu.cpp')
| -rw-r--r-- | src/core/core_cpu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp index e75741db0..ba63c3e61 100644 --- a/src/core/core_cpu.cpp +++ b/src/core/core_cpu.cpp | |||
| @@ -55,13 +55,13 @@ Cpu::Cpu(System& system, ExclusiveMonitor& exclusive_monitor, CpuBarrier& cpu_ba | |||
| 55 | : cpu_barrier{cpu_barrier}, core_timing{system.CoreTiming()}, core_index{core_index} { | 55 | : cpu_barrier{cpu_barrier}, core_timing{system.CoreTiming()}, core_index{core_index} { |
| 56 | if (Settings::values.use_cpu_jit) { | 56 | if (Settings::values.use_cpu_jit) { |
| 57 | #ifdef ARCHITECTURE_x86_64 | 57 | #ifdef ARCHITECTURE_x86_64 |
| 58 | arm_interface = std::make_unique<ARM_Dynarmic>(core_timing, exclusive_monitor, core_index); | 58 | arm_interface = std::make_unique<ARM_Dynarmic>(system, exclusive_monitor, core_index); |
| 59 | #else | 59 | #else |
| 60 | arm_interface = std::make_unique<ARM_Unicorn>(); | 60 | arm_interface = std::make_unique<ARM_Unicorn>(system); |
| 61 | LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available"); | 61 | LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available"); |
| 62 | #endif | 62 | #endif |
| 63 | } else { | 63 | } else { |
| 64 | arm_interface = std::make_unique<ARM_Unicorn>(core_timing); | 64 | arm_interface = std::make_unique<ARM_Unicorn>(system); |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | scheduler = std::make_unique<Kernel::Scheduler>(system, *arm_interface); | 67 | scheduler = std::make_unique<Kernel::Scheduler>(system, *arm_interface); |