diff options
author | Lioncash <mathew1800@gmail.com> | 2018-09-18 00:15:09 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-09-18 00:16:55 +0200 |
commit | 4a84986bc3a7cd14c40b36f084388baad6fbbd62 (patch) | |
tree | 44c01b70e77f91fb4cfc078e63c637bbde5a8d10 /src/core | |
parent | Merge pull request #1311 from FernandoS27/fast-swizzle (diff) | |
download | yuzu-4a84986bc3a7cd14c40b36f084388baad6fbbd62.tar yuzu-4a84986bc3a7cd14c40b36f084388baad6fbbd62.tar.gz yuzu-4a84986bc3a7cd14c40b36f084388baad6fbbd62.tar.bz2 yuzu-4a84986bc3a7cd14c40b36f084388baad6fbbd62.tar.lz yuzu-4a84986bc3a7cd14c40b36f084388baad6fbbd62.tar.xz yuzu-4a84986bc3a7cd14c40b36f084388baad6fbbd62.tar.zst yuzu-4a84986bc3a7cd14c40b36f084388baad6fbbd62.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/core_cpu.cpp | 3 | ||||
-rw-r--r-- | src/core/core_cpu.h | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp index 15d60cc8a..21568ad50 100644 --- a/src/core/core_cpu.cpp +++ b/src/core/core_cpu.cpp @@ -9,6 +9,7 @@ #ifdef ARCHITECTURE_x86_64 #include "core/arm/dynarmic/arm_dynarmic.h" #endif +#include "core/arm/exclusive_monitor.h" #include "core/arm/unicorn/arm_unicorn.h" #include "core/core_cpu.h" #include "core/core_timing.h" @@ -66,6 +67,8 @@ Cpu::Cpu(std::shared_ptr<ExclusiveMonitor> exclusive_monitor, scheduler = std::make_shared<Kernel::Scheduler>(arm_interface.get()); } +Cpu::~Cpu() = default; + std::shared_ptr<ExclusiveMonitor> Cpu::MakeExclusiveMonitor(std::size_t num_cores) { if (Settings::values.use_cpu_jit) { #ifdef ARCHITECTURE_x86_64 diff --git a/src/core/core_cpu.h b/src/core/core_cpu.h index 1d229b42f..685532965 100644 --- a/src/core/core_cpu.h +++ b/src/core/core_cpu.h @@ -6,11 +6,10 @@ #include <atomic> #include <condition_variable> +#include <cstddef> #include <memory> #include <mutex> -#include <string> #include "common/common_types.h" -#include "core/arm/exclusive_monitor.h" namespace Kernel { class Scheduler; @@ -19,6 +18,7 @@ class Scheduler; namespace Core { class ARM_Interface; +class ExclusiveMonitor; constexpr unsigned NUM_CPU_CORES{4}; @@ -43,6 +43,7 @@ class Cpu { public: Cpu(std::shared_ptr<ExclusiveMonitor> exclusive_monitor, std::shared_ptr<CpuBarrier> cpu_barrier, std::size_t core_index); + ~Cpu(); void RunLoop(bool tight_loop = true); |