summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-09-25 22:04:53 +0200
committerLioncash <mathew1800@gmail.com>2018-09-25 22:04:56 +0200
commit598e4d2f6ccfc3dc774a28be53d8b1d78ebbd08d (patch)
tree1d43801463284752d6ecec43c9a1e7850caef607 /src
parentkernel/scheduler: Take ARM_Interface instance by reference in the constructor (diff)
downloadyuzu-598e4d2f6ccfc3dc774a28be53d8b1d78ebbd08d.tar
yuzu-598e4d2f6ccfc3dc774a28be53d8b1d78ebbd08d.tar.gz
yuzu-598e4d2f6ccfc3dc774a28be53d8b1d78ebbd08d.tar.bz2
yuzu-598e4d2f6ccfc3dc774a28be53d8b1d78ebbd08d.tar.lz
yuzu-598e4d2f6ccfc3dc774a28be53d8b1d78ebbd08d.tar.xz
yuzu-598e4d2f6ccfc3dc774a28be53d8b1d78ebbd08d.tar.zst
yuzu-598e4d2f6ccfc3dc774a28be53d8b1d78ebbd08d.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/core_cpu.cpp6
-rw-r--r--src/core/core_cpu.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp
index 0140e9713..265f8ed9c 100644
--- a/src/core/core_cpu.cpp
+++ b/src/core/core_cpu.cpp
@@ -55,13 +55,13 @@ Cpu::Cpu(std::shared_ptr<ExclusiveMonitor> exclusive_monitor,
if (Settings::values.use_cpu_jit) {
#ifdef ARCHITECTURE_x86_64
- arm_interface = std::make_shared<ARM_Dynarmic>(exclusive_monitor, core_index);
+ arm_interface = std::make_unique<ARM_Dynarmic>(exclusive_monitor, core_index);
#else
- arm_interface = std::make_shared<ARM_Unicorn>();
+ arm_interface = std::make_unique<ARM_Unicorn>();
LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available");
#endif
} else {
- arm_interface = std::make_shared<ARM_Unicorn>();
+ arm_interface = std::make_unique<ARM_Unicorn>();
}
scheduler = std::make_shared<Kernel::Scheduler>(*arm_interface);
diff --git a/src/core/core_cpu.h b/src/core/core_cpu.h
index 685532965..ee7e04abc 100644
--- a/src/core/core_cpu.h
+++ b/src/core/core_cpu.h
@@ -76,7 +76,7 @@ public:
private:
void Reschedule();
- std::shared_ptr<ARM_Interface> arm_interface;
+ std::unique_ptr<ARM_Interface> arm_interface;
std::shared_ptr<CpuBarrier> cpu_barrier;
std::shared_ptr<Kernel::Scheduler> scheduler;