summaryrefslogtreecommitdiff
path: root/src/core/core_cpu.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-09-26 16:17:18 -0400
committerGravatar GitHub2018-09-26 16:17:18 -0400
commitc0445006af7f985df0f8ec04ac815ee0b8ffabeb (patch)
treeb85f6c839d042bcf9bfca4b0321d846aef74f5f5 /src/core/core_cpu.cpp
parentMerge pull request #1400 from lioncash/header (diff)
parentcore_cpu: Make arm_interface instances a std::unique_ptr (diff)
downloadyuzu-c0445006af7f985df0f8ec04ac815ee0b8ffabeb.tar.gz
yuzu-c0445006af7f985df0f8ec04ac815ee0b8ffabeb.tar.xz
yuzu-c0445006af7f985df0f8ec04ac815ee0b8ffabeb.zip
Merge pull request #1399 from lioncash/sched
kernel/scheduler: Take ARM_Interface instances by reference
Diffstat (limited to 'src/core/core_cpu.cpp')
-rw-r--r--src/core/core_cpu.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp
index 21568ad50..265f8ed9c 100644
--- a/src/core/core_cpu.cpp
+++ b/src/core/core_cpu.cpp
@@ -55,16 +55,16 @@ Cpu::Cpu(std::shared_ptr<ExclusiveMonitor> exclusive_monitor,
55 55
56 if (Settings::values.use_cpu_jit) { 56 if (Settings::values.use_cpu_jit) {
57#ifdef ARCHITECTURE_x86_64 57#ifdef ARCHITECTURE_x86_64
58 arm_interface = std::make_shared<ARM_Dynarmic>(exclusive_monitor, core_index); 58 arm_interface = std::make_unique<ARM_Dynarmic>(exclusive_monitor, core_index);
59#else 59#else
60 arm_interface = std::make_shared<ARM_Unicorn>(); 60 arm_interface = std::make_unique<ARM_Unicorn>();
61 LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available"); 61 LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available");
62#endif 62#endif
63 } else { 63 } else {
64 arm_interface = std::make_shared<ARM_Unicorn>(); 64 arm_interface = std::make_unique<ARM_Unicorn>();
65 } 65 }
66 66
67 scheduler = std::make_shared<Kernel::Scheduler>(arm_interface.get()); 67 scheduler = std::make_shared<Kernel::Scheduler>(*arm_interface);
68} 68}
69 69
70Cpu::~Cpu() = default; 70Cpu::~Cpu() = default;