diff options
| author | 2020-04-24 00:07:38 -0400 | |
|---|---|---|
| committer | 2020-04-24 00:20:58 -0400 | |
| commit | cc84b48ce5b981bbdc737931c1030f8d3ff3f32b (patch) | |
| tree | 975d5ac2e30ba6031a59d562b31698782f3cfcad /src/core/hle/kernel | |
| parent | Merge pull request #3768 from H27CK/cmd-title-fmt (diff) | |
| download | yuzu-cc84b48ce5b981bbdc737931c1030f8d3ff3f32b.tar.gz yuzu-cc84b48ce5b981bbdc737931c1030f8d3ff3f32b.tar.xz yuzu-cc84b48ce5b981bbdc737931c1030f8d3ff3f32b.zip | |
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.
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/physical_core.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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, | |||
| 27 | std::make_unique<Core::ARM_Dynarmic_64>(system, exclusive_monitor, core_index); | 27 | std::make_unique<Core::ARM_Dynarmic_64>(system, exclusive_monitor, core_index); |
| 28 | 28 | ||
| 29 | #else | 29 | #else |
| 30 | arm_interface = std::make_shared<Core::ARM_Unicorn>(system); | 30 | using Core::ARM_Unicorn; |
| 31 | arm_interface_32 = std::make_unique<ARM_Unicorn>(system, ARM_Unicorn::Arch::AArch32); | ||
| 32 | arm_interface_64 = std::make_unique<ARM_Unicorn>(system, ARM_Unicorn::Arch::AArch64); | ||
| 31 | LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available"); | 33 | LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available"); |
| 32 | #endif | 34 | #endif |
| 33 | 35 | ||