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/arm/dynarmic | |
| 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/arm/dynarmic')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_64.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
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() { | |||
| 185 | 185 | ||
| 186 | ARM_Dynarmic_64::ARM_Dynarmic_64(System& system, ExclusiveMonitor& exclusive_monitor, | 186 | ARM_Dynarmic_64::ARM_Dynarmic_64(System& system, ExclusiveMonitor& exclusive_monitor, |
| 187 | std::size_t core_index) | 187 | std::size_t core_index) |
| 188 | : ARM_Interface{system}, | 188 | : ARM_Interface{system}, cb(std::make_unique<DynarmicCallbacks64>(*this)), |
| 189 | cb(std::make_unique<DynarmicCallbacks64>(*this)), inner_unicorn{system}, | 189 | inner_unicorn{system, ARM_Unicorn::Arch::AArch64}, core_index{core_index}, |
| 190 | core_index{core_index}, exclusive_monitor{ | 190 | exclusive_monitor{dynamic_cast<DynarmicExclusiveMonitor&>(exclusive_monitor)} {} |
| 191 | dynamic_cast<DynarmicExclusiveMonitor&>(exclusive_monitor)} {} | ||
| 192 | 191 | ||
| 193 | ARM_Dynarmic_64::~ARM_Dynarmic_64() = default; | 192 | ARM_Dynarmic_64::~ARM_Dynarmic_64() = default; |
| 194 | 193 | ||