summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-01-31 00:38:28 +0100
committerLioncash <mathew1800@gmail.com>2020-01-31 00:42:40 +0100
commit2de2bb980e8b032aeb6413adaaed6701e76e73f7 (patch)
tree8156623d13b7708b2808ea69d6f80a835136797b
parentcore/cpu_manager: Remove unused includes (diff)
downloadyuzu-2de2bb980e8b032aeb6413adaaed6701e76e73f7.tar
yuzu-2de2bb980e8b032aeb6413adaaed6701e76e73f7.tar.gz
yuzu-2de2bb980e8b032aeb6413adaaed6701e76e73f7.tar.bz2
yuzu-2de2bb980e8b032aeb6413adaaed6701e76e73f7.tar.lz
yuzu-2de2bb980e8b032aeb6413adaaed6701e76e73f7.tar.xz
yuzu-2de2bb980e8b032aeb6413adaaed6701e76e73f7.tar.zst
yuzu-2de2bb980e8b032aeb6413adaaed6701e76e73f7.zip
-rw-r--r--src/core/hle/kernel/physical_core.cpp4
-rw-r--r--src/core/hle/kernel/physical_core.h10
2 files changed, 10 insertions, 4 deletions
diff --git a/src/core/hle/kernel/physical_core.cpp b/src/core/hle/kernel/physical_core.cpp
index e96d063fd..9303dd273 100644
--- a/src/core/hle/kernel/physical_core.cpp
+++ b/src/core/hle/kernel/physical_core.cpp
@@ -20,13 +20,13 @@ PhysicalCore::PhysicalCore(Core::System& system, std::size_t id,
Core::ExclusiveMonitor& exclusive_monitor)
: core_index{id} {
#ifdef ARCHITECTURE_x86_64
- arm_interface = std::make_shared<Core::ARM_Dynarmic>(system, exclusive_monitor, core_index);
+ arm_interface = std::make_unique<Core::ARM_Dynarmic>(system, exclusive_monitor, core_index);
#else
arm_interface = std::make_shared<Core::ARM_Unicorn>(system);
LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available");
#endif
- scheduler = std::make_shared<Kernel::Scheduler>(system, *arm_interface, core_index);
+ scheduler = std::make_unique<Kernel::Scheduler>(system, *arm_interface, core_index);
}
PhysicalCore::~PhysicalCore() = default;
diff --git a/src/core/hle/kernel/physical_core.h b/src/core/hle/kernel/physical_core.h
index 7dca97d1b..4c32c0f1b 100644
--- a/src/core/hle/kernel/physical_core.h
+++ b/src/core/hle/kernel/physical_core.h
@@ -24,6 +24,12 @@ public:
PhysicalCore(Core::System& system, std::size_t id, Core::ExclusiveMonitor& exclusive_monitor);
~PhysicalCore();
+ PhysicalCore(const PhysicalCore&) = delete;
+ PhysicalCore& operator=(const PhysicalCore&) = delete;
+
+ PhysicalCore(PhysicalCore&&) = default;
+ PhysicalCore& operator=(PhysicalCore&&) = default;
+
/// Execute current jit state
void Run();
/// Execute a single instruction in current jit.
@@ -64,8 +70,8 @@ public:
private:
std::size_t core_index;
- std::shared_ptr<Core::ARM_Interface> arm_interface;
- std::shared_ptr<Kernel::Scheduler> scheduler;
+ std::unique_ptr<Core::ARM_Interface> arm_interface;
+ std::unique_ptr<Kernel::Scheduler> scheduler;
};
} // namespace Kernel