summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiacomo Travaglini <giacomo.travaglini@arm.com>2019-07-22 15:06:40 +0100
committerGiacomo Travaglini <giacomo.travaglini@arm.com>2019-07-25 12:49:12 +0000
commit36da743e0b934c853cab41e5254e1ba2e93f157d (patch)
treefe4b61ef5d2a4d0822ffb50744f215ca83675d8a
parent3ed50acb1ebc7a301196ee877253f6d11efb4164 (diff)
downloadgem5-36da743e0b934c853cab41e5254e1ba2e93f157d.tar.xz
dev-arm: Use override keyword for SMMUv3 PTOPS
Replacing the "virtual" keyword Change-Id: I0e7b4b683ea222827a67c3a81f0deea0e906c7e5 Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-by: Michiel Van Tol <michiel.vantol@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/19629 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Maintainer: Andreas Sandberg <andreas.sandberg@arm.com> Tested-by: kokoro <noreply+kokoro@google.com>
-rw-r--r--src/dev/arm/smmu_v3_ptops.hh72
1 files changed, 36 insertions, 36 deletions
diff --git a/src/dev/arm/smmu_v3_ptops.hh b/src/dev/arm/smmu_v3_ptops.hh
index 1b8c22c4d..8680541c6 100644
--- a/src/dev/arm/smmu_v3_ptops.hh
+++ b/src/dev/arm/smmu_v3_ptops.hh
@@ -61,54 +61,54 @@ struct PageTableOps
struct V7LPageTableOps : public PageTableOps
{
- virtual bool isValid(pte_t pte, unsigned level) const;
- virtual bool isLeaf(pte_t pte, unsigned level) const;
- virtual bool isWritable(pte_t pte, unsigned level, bool stage2) const;
- virtual Addr nextLevelPointer(pte_t pte, unsigned level) const;
- virtual Addr index(Addr va, unsigned level) const;
- virtual Addr pageMask(pte_t pte, unsigned level) const;
- virtual Addr walkMask(unsigned level) const;
- virtual unsigned firstLevel() const;
- virtual unsigned lastLevel() const;
+ bool isValid(pte_t pte, unsigned level) const override;
+ bool isLeaf(pte_t pte, unsigned level) const override;
+ bool isWritable(pte_t pte, unsigned level, bool stage2) const override;
+ Addr nextLevelPointer(pte_t pte, unsigned level) const override;
+ Addr index(Addr va, unsigned level) const override;
+ Addr pageMask(pte_t pte, unsigned level) const override;
+ Addr walkMask(unsigned level) const override;
+ unsigned firstLevel() const override;
+ unsigned lastLevel() const override;
};
struct V8PageTableOps4k : public PageTableOps
{
- virtual bool isValid(pte_t pte, unsigned level) const;
- virtual bool isLeaf(pte_t pte, unsigned level) const;
- virtual bool isWritable(pte_t pte, unsigned level, bool stage2) const;
- virtual Addr nextLevelPointer(pte_t pte, unsigned level) const;
- virtual Addr index(Addr va, unsigned level) const;
- virtual Addr pageMask(pte_t pte, unsigned level) const;
- virtual Addr walkMask(unsigned level) const;
- virtual unsigned firstLevel() const;
- virtual unsigned lastLevel() const;
+ bool isValid(pte_t pte, unsigned level) const override;
+ bool isLeaf(pte_t pte, unsigned level) const override;
+ bool isWritable(pte_t pte, unsigned level, bool stage2) const override;
+ Addr nextLevelPointer(pte_t pte, unsigned level) const override;
+ Addr index(Addr va, unsigned level) const override;
+ Addr pageMask(pte_t pte, unsigned level) const override;
+ Addr walkMask(unsigned level) const override;
+ unsigned firstLevel() const override;
+ unsigned lastLevel() const override;
};
struct V8PageTableOps16k : public PageTableOps
{
- virtual bool isValid(pte_t pte, unsigned level) const;
- virtual bool isLeaf(pte_t pte, unsigned level) const;
- virtual bool isWritable(pte_t pte, unsigned level, bool stage2) const;
- virtual Addr nextLevelPointer(pte_t pte, unsigned level) const;
- virtual Addr index(Addr va, unsigned level) const;
- virtual Addr pageMask(pte_t pte, unsigned level) const;
- virtual Addr walkMask(unsigned level) const;
- virtual unsigned firstLevel() const;
- virtual unsigned lastLevel() const;
+ bool isValid(pte_t pte, unsigned level) const override;
+ bool isLeaf(pte_t pte, unsigned level) const override;
+ bool isWritable(pte_t pte, unsigned level, bool stage2) const override;
+ Addr nextLevelPointer(pte_t pte, unsigned level) const override;
+ Addr index(Addr va, unsigned level) const override;
+ Addr pageMask(pte_t pte, unsigned level) const override;
+ Addr walkMask(unsigned level) const override;
+ unsigned firstLevel() const override;
+ unsigned lastLevel() const override;
};
struct V8PageTableOps64k : public PageTableOps
{
- virtual bool isValid(pte_t pte, unsigned level) const;
- virtual bool isLeaf(pte_t pte, unsigned level) const;
- virtual bool isWritable(pte_t pte, unsigned level, bool stage2) const;
- virtual Addr nextLevelPointer(pte_t pte, unsigned level) const;
- virtual Addr index(Addr va, unsigned level) const;
- virtual Addr pageMask(pte_t pte, unsigned level) const;
- virtual Addr walkMask(unsigned level) const;
- virtual unsigned firstLevel() const;
- virtual unsigned lastLevel() const;
+ bool isValid(pte_t pte, unsigned level) const override;
+ bool isLeaf(pte_t pte, unsigned level) const override;
+ bool isWritable(pte_t pte, unsigned level, bool stage2) const override;
+ Addr nextLevelPointer(pte_t pte, unsigned level) const override;
+ Addr index(Addr va, unsigned level) const override;
+ Addr pageMask(pte_t pte, unsigned level) const override;
+ Addr walkMask(unsigned level) const override;
+ unsigned firstLevel() const override;
+ unsigned lastLevel() const override;
};
#endif /* __DEV_ARM_SMMU_V3_PTOPS_HH__ */