diff options
| author | 2019-04-05 23:39:52 -0400 | |
|---|---|---|
| committer | 2019-04-05 23:39:52 -0400 | |
| commit | e86b26cd2b263f3d5d97352f87a31dc65bd3cead (patch) | |
| tree | d4b57743c0b88165e796a126bfd21e9d6090a67a /src/core/arm | |
| parent | Merge pull request #2347 from lioncash/trunc (diff) | |
| parent | core: Add missing override specifiers where applicable (diff) | |
| download | yuzu-e86b26cd2b263f3d5d97352f87a31dc65bd3cead.tar.gz yuzu-e86b26cd2b263f3d5d97352f87a31dc65bd3cead.tar.xz yuzu-e86b26cd2b263f3d5d97352f87a31dc65bd3cead.zip | |
Merge pull request #2334 from lioncash/override
core: Add missing override specifiers where applicable
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; | |||
| 26 | class ARM_Dynarmic_Callbacks : public Dynarmic::A64::UserCallbacks { | 26 | class ARM_Dynarmic_Callbacks : public Dynarmic::A64::UserCallbacks { |
| 27 | public: | 27 | public: |
| 28 | explicit ARM_Dynarmic_Callbacks(ARM_Dynarmic& parent) : parent(parent) {} | 28 | explicit ARM_Dynarmic_Callbacks(ARM_Dynarmic& parent) : parent(parent) {} |
| 29 | ~ARM_Dynarmic_Callbacks() = default; | ||
| 30 | 29 | ||
| 31 | u8 MemoryRead8(u64 vaddr) override { | 30 | u8 MemoryRead8(u64 vaddr) override { |
| 32 | return Memory::Read8(vaddr); | 31 | 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 { | |||
| 29 | public: | 29 | public: |
| 30 | ARM_Dynarmic(Timing::CoreTiming& core_timing, ExclusiveMonitor& exclusive_monitor, | 30 | ARM_Dynarmic(Timing::CoreTiming& core_timing, ExclusiveMonitor& exclusive_monitor, |
| 31 | std::size_t core_index); | 31 | std::size_t core_index); |
| 32 | ~ARM_Dynarmic(); | 32 | ~ARM_Dynarmic() override; |
| 33 | 33 | ||
| 34 | void MapBackingMemory(VAddr address, std::size_t size, u8* memory, | 34 | void MapBackingMemory(VAddr address, std::size_t size, u8* memory, |
| 35 | Kernel::VMAPermission perms) override; | 35 | Kernel::VMAPermission perms) override; |
| @@ -76,7 +76,7 @@ private: | |||
| 76 | class DynarmicExclusiveMonitor final : public ExclusiveMonitor { | 76 | class DynarmicExclusiveMonitor final : public ExclusiveMonitor { |
| 77 | public: | 77 | public: |
| 78 | explicit DynarmicExclusiveMonitor(std::size_t core_count); | 78 | explicit DynarmicExclusiveMonitor(std::size_t core_count); |
| 79 | ~DynarmicExclusiveMonitor(); | 79 | ~DynarmicExclusiveMonitor() override; |
| 80 | 80 | ||
| 81 | void SetExclusive(std::size_t core_index, VAddr addr) override; | 81 | void SetExclusive(std::size_t core_index, VAddr addr) override; |
| 82 | void ClearExclusive() override; | 82 | 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 { | |||
| 18 | class ARM_Unicorn final : public ARM_Interface { | 18 | class ARM_Unicorn final : public ARM_Interface { |
| 19 | public: | 19 | public: |
| 20 | explicit ARM_Unicorn(Timing::CoreTiming& core_timing); | 20 | explicit ARM_Unicorn(Timing::CoreTiming& core_timing); |
| 21 | ~ARM_Unicorn(); | 21 | ~ARM_Unicorn() override; |
| 22 | 22 | ||
| 23 | void MapBackingMemory(VAddr address, std::size_t size, u8* memory, | 23 | void MapBackingMemory(VAddr address, std::size_t size, u8* memory, |
| 24 | Kernel::VMAPermission perms) override; | 24 | Kernel::VMAPermission perms) override; |