summaryrefslogtreecommitdiffstats
path: root/src/core/core_cpu.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-10-15 14:42:06 +0200
committerLioncash <mathew1800@gmail.com>2018-10-15 15:11:47 +0200
commitc34efbbd60a41afbbab2ff17bbff999519cfb4b6 (patch)
treebc6fa89e02a4c8d43b3cee93c124e3bc74b476b5 /src/core/core_cpu.cpp
parentMerge pull request #1486 from lioncash/file (diff)
downloadyuzu-c34efbbd60a41afbbab2ff17bbff999519cfb4b6.tar
yuzu-c34efbbd60a41afbbab2ff17bbff999519cfb4b6.tar.gz
yuzu-c34efbbd60a41afbbab2ff17bbff999519cfb4b6.tar.bz2
yuzu-c34efbbd60a41afbbab2ff17bbff999519cfb4b6.tar.lz
yuzu-c34efbbd60a41afbbab2ff17bbff999519cfb4b6.tar.xz
yuzu-c34efbbd60a41afbbab2ff17bbff999519cfb4b6.tar.zst
yuzu-c34efbbd60a41afbbab2ff17bbff999519cfb4b6.zip
Diffstat (limited to '')
-rw-r--r--src/core/core_cpu.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp
index 265f8ed9c..928262c9b 100644
--- a/src/core/core_cpu.cpp
+++ b/src/core/core_cpu.cpp
@@ -49,10 +49,9 @@ bool CpuBarrier::Rendezvous() {
return false;
}
-Cpu::Cpu(std::shared_ptr<ExclusiveMonitor> exclusive_monitor,
- std::shared_ptr<CpuBarrier> cpu_barrier, std::size_t core_index)
- : cpu_barrier{std::move(cpu_barrier)}, core_index{core_index} {
-
+Cpu::Cpu(std::shared_ptr<ExclusiveMonitor> exclusive_monitor, CpuBarrier& cpu_barrier,
+ std::size_t core_index)
+ : cpu_barrier{cpu_barrier}, core_index{core_index} {
if (Settings::values.use_cpu_jit) {
#ifdef ARCHITECTURE_x86_64
arm_interface = std::make_unique<ARM_Dynarmic>(exclusive_monitor, core_index);
@@ -83,7 +82,7 @@ std::shared_ptr<ExclusiveMonitor> Cpu::MakeExclusiveMonitor(std::size_t num_core
void Cpu::RunLoop(bool tight_loop) {
// Wait for all other CPU cores to complete the previous slice, such that they run in lock-step
- if (!cpu_barrier->Rendezvous()) {
+ if (!cpu_barrier.Rendezvous()) {
// If rendezvous failed, session has been killed
return;
}