From cc84b48ce5b981bbdc737931c1030f8d3ff3f32b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 24 Apr 2020 00:07:38 -0400 Subject: physical_core: Make use of std::make_unique instead of std::make_shared in ctor We can also allow unicorn to be constructed in 32-bit mode or 64-bit mode to satisfy the need for both interpreter instances. Allows this code to compile successfully of non x86-64 architectures. --- src/core/hle/kernel/physical_core.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/core/hle/kernel') diff --git a/src/core/hle/kernel/physical_core.cpp b/src/core/hle/kernel/physical_core.cpp index aa2787467..a15011076 100644 --- a/src/core/hle/kernel/physical_core.cpp +++ b/src/core/hle/kernel/physical_core.cpp @@ -27,7 +27,9 @@ PhysicalCore::PhysicalCore(Core::System& system, std::size_t id, std::make_unique(system, exclusive_monitor, core_index); #else - arm_interface = std::make_shared(system); + using Core::ARM_Unicorn; + arm_interface_32 = std::make_unique(system, ARM_Unicorn::Arch::AArch32); + arm_interface_64 = std::make_unique(system, ARM_Unicorn::Arch::AArch64); LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available"); #endif -- cgit v1.2.3