diff options
author | Lioncash <mathew1800@gmail.com> | 2019-04-04 18:16:56 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-04-04 18:19:44 +0200 |
commit | 5b0a9f8ba8452373a4bf0a84d1c5c3734bd04d3c (patch) | |
tree | 0d7b041cdfabd0e7317b3dc28d52f0ebf9d0445e /src/core/arm | |
parent | Merge pull request #2330 from lioncash/pragma (diff) | |
download | yuzu-5b0a9f8ba8452373a4bf0a84d1c5c3734bd04d3c.tar yuzu-5b0a9f8ba8452373a4bf0a84d1c5c3734bd04d3c.tar.gz yuzu-5b0a9f8ba8452373a4bf0a84d1c5c3734bd04d3c.tar.bz2 yuzu-5b0a9f8ba8452373a4bf0a84d1c5c3734bd04d3c.tar.lz yuzu-5b0a9f8ba8452373a4bf0a84d1c5c3734bd04d3c.tar.xz yuzu-5b0a9f8ba8452373a4bf0a84d1c5c3734bd04d3c.tar.zst yuzu-5b0a9f8ba8452373a4bf0a84d1c5c3734bd04d3c.zip |
Diffstat (limited to 'src/core/arm')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 1 | ||||
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.h | 4 | ||||
-rw-r--r-- | src/core/arm/unicorn/arm_unicorn.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 4fdc12f11..f64e4c6a6 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -26,7 +26,6 @@ using Vector = Dynarmic::A64::Vector; class ARM_Dynarmic_Callbacks : public Dynarmic::A64::UserCallbacks { public: explicit ARM_Dynarmic_Callbacks(ARM_Dynarmic& parent) : parent(parent) {} - ~ARM_Dynarmic_Callbacks() = default; u8 MemoryRead8(u64 vaddr) override { return Memory::Read8(vaddr); diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h index aada1e862..81e0b4ac0 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.h +++ b/src/core/arm/dynarmic/arm_dynarmic.h @@ -29,7 +29,7 @@ class ARM_Dynarmic final : public ARM_Interface { public: ARM_Dynarmic(Timing::CoreTiming& core_timing, ExclusiveMonitor& exclusive_monitor, std::size_t core_index); - ~ARM_Dynarmic(); + ~ARM_Dynarmic() override; void MapBackingMemory(VAddr address, std::size_t size, u8* memory, Kernel::VMAPermission perms) override; @@ -76,7 +76,7 @@ private: class DynarmicExclusiveMonitor final : public ExclusiveMonitor { public: explicit DynarmicExclusiveMonitor(std::size_t core_count); - ~DynarmicExclusiveMonitor(); + ~DynarmicExclusiveMonitor() override; void SetExclusive(std::size_t core_index, VAddr addr) override; void ClearExclusive() override; diff --git a/src/core/arm/unicorn/arm_unicorn.h b/src/core/arm/unicorn/arm_unicorn.h index dbd6955ea..f313b7394 100644 --- a/src/core/arm/unicorn/arm_unicorn.h +++ b/src/core/arm/unicorn/arm_unicorn.h @@ -18,7 +18,7 @@ namespace Core { class ARM_Unicorn final : public ARM_Interface { public: explicit ARM_Unicorn(Timing::CoreTiming& core_timing); - ~ARM_Unicorn(); + ~ARM_Unicorn() override; void MapBackingMemory(VAddr address, std::size_t size, u8* memory, Kernel::VMAPermission perms) override; |