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/arm/dynarmic/arm_dynarmic_64.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/core/arm/dynarmic') diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index 65cbfe5e6..337b97be9 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp @@ -185,10 +185,9 @@ void ARM_Dynarmic_64::Step() { ARM_Dynarmic_64::ARM_Dynarmic_64(System& system, ExclusiveMonitor& exclusive_monitor, std::size_t core_index) - : ARM_Interface{system}, - cb(std::make_unique(*this)), inner_unicorn{system}, - core_index{core_index}, exclusive_monitor{ - dynamic_cast(exclusive_monitor)} {} + : ARM_Interface{system}, cb(std::make_unique(*this)), + inner_unicorn{system, ARM_Unicorn::Arch::AArch64}, core_index{core_index}, + exclusive_monitor{dynamic_cast(exclusive_monitor)} {} ARM_Dynarmic_64::~ARM_Dynarmic_64() = default; -- cgit v1.2.3