diff options
author | Lioncash <mathew1800@gmail.com> | 2019-03-04 22:02:59 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-03-04 23:01:37 +0100 |
commit | fad20213e6f377d75ced3c2554b4f00a46ff9263 (patch) | |
tree | 8911a6765d4549836fec1e5b06c64b5e94f4860d /src/core/core_cpu.cpp | |
parent | Merge pull request #2165 from ReinUsesLisp/unbind-tex (diff) | |
download | yuzu-fad20213e6f377d75ced3c2554b4f00a46ff9263.tar yuzu-fad20213e6f377d75ced3c2554b4f00a46ff9263.tar.gz yuzu-fad20213e6f377d75ced3c2554b4f00a46ff9263.tar.bz2 yuzu-fad20213e6f377d75ced3c2554b4f00a46ff9263.tar.lz yuzu-fad20213e6f377d75ced3c2554b4f00a46ff9263.tar.xz yuzu-fad20213e6f377d75ced3c2554b4f00a46ff9263.tar.zst yuzu-fad20213e6f377d75ced3c2554b4f00a46ff9263.zip |
Diffstat (limited to 'src/core/core_cpu.cpp')
-rw-r--r-- | src/core/core_cpu.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp index 54aa21a3a..1eefed6d0 100644 --- a/src/core/core_cpu.cpp +++ b/src/core/core_cpu.cpp @@ -11,6 +11,7 @@ #endif #include "core/arm/exclusive_monitor.h" #include "core/arm/unicorn/arm_unicorn.h" +#include "core/core.h" #include "core/core_cpu.h" #include "core/core_timing.h" #include "core/hle/kernel/scheduler.h" @@ -49,9 +50,9 @@ bool CpuBarrier::Rendezvous() { return false; } -Cpu::Cpu(Timing::CoreTiming& core_timing, ExclusiveMonitor& exclusive_monitor, - CpuBarrier& cpu_barrier, std::size_t core_index) - : cpu_barrier{cpu_barrier}, core_timing{core_timing}, core_index{core_index} { +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.use_cpu_jit) { #ifdef ARCHITECTURE_x86_64 arm_interface = std::make_unique<ARM_Dynarmic>(core_timing, exclusive_monitor, core_index); @@ -63,7 +64,7 @@ Cpu::Cpu(Timing::CoreTiming& core_timing, ExclusiveMonitor& exclusive_monitor, arm_interface = std::make_unique<ARM_Unicorn>(core_timing); } - scheduler = std::make_unique<Kernel::Scheduler>(*arm_interface); + scheduler = std::make_unique<Kernel::Scheduler>(system, *arm_interface); } Cpu::~Cpu() = default; |