summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-09-19 04:13:05 +0200
committerGitHub <noreply@github.com>2018-09-19 04:13:05 +0200
commitbf957d5345f385633fb3675c3dc35c8721509095 (patch)
tree5da64e8b1d307b9092e51a82fc7599e847f45c5d /src/core
parentMerge pull request #1346 from lioncash/svc (diff)
parentcore/core_cpu: Replace exclusive monitor include with forward declaration (diff)
downloadyuzu-bf957d5345f385633fb3675c3dc35c8721509095.tar
yuzu-bf957d5345f385633fb3675c3dc35c8721509095.tar.gz
yuzu-bf957d5345f385633fb3675c3dc35c8721509095.tar.bz2
yuzu-bf957d5345f385633fb3675c3dc35c8721509095.tar.lz
yuzu-bf957d5345f385633fb3675c3dc35c8721509095.tar.xz
yuzu-bf957d5345f385633fb3675c3dc35c8721509095.tar.zst
yuzu-bf957d5345f385633fb3675c3dc35c8721509095.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/core_cpu.cpp3
-rw-r--r--src/core/core_cpu.h5
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);