diff options
| author | bunnei <bunneidev@gmail.com> | 2020-01-30 23:33:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-30 23:33:02 -0500 |
| commit | 6b5b01b29f51cf74c0735867f800afb9672729d9 (patch) | |
| tree | 21f251c154835bc82f24a9b82a048f45e0495a7b /src/core/hle/kernel/physical_core.cpp | |
| parent | 1948fc085804f000400ba7c35e57972a36ea75bc (diff) | |
| parent | 2de2bb980e8b032aeb6413adaaed6701e76e73f7 (diff) | |
Merge pull request #3363 from lioncash/unique_ptr
kernel/physical_core: Make use of std::unique_ptr instead of std::shared_ptr
Diffstat (limited to 'src/core/hle/kernel/physical_core.cpp')
| -rw-r--r-- | src/core/hle/kernel/physical_core.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/hle/kernel/physical_core.cpp b/src/core/hle/kernel/physical_core.cpp index 896a1a87a..9303dd273 100644 --- a/src/core/hle/kernel/physical_core.cpp +++ b/src/core/hle/kernel/physical_core.cpp @@ -10,24 +10,23 @@ #include "core/arm/exclusive_monitor.h" #include "core/arm/unicorn/arm_unicorn.h" #include "core/core.h" -#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/physical_core.h" #include "core/hle/kernel/scheduler.h" #include "core/hle/kernel/thread.h" namespace Kernel { -PhysicalCore::PhysicalCore(Core::System& system, KernelCore& kernel, std::size_t id, +PhysicalCore::PhysicalCore(Core::System& system, std::size_t id, Core::ExclusiveMonitor& exclusive_monitor) - : core_index{id}, kernel{kernel} { + : 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; |
