From cdf3cc2b95137807672ef7b8057695a13ce1cc33 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 23 Mar 2018 17:39:32 -0700 Subject: arch: Fix all override related warnings. Clang has started(?) reporting override related warnings, something gcc apparently did before, but was disabled in the SConstruct. Rather than disable the warnings in for clang as well, this change fixes the warnings. A future change will re-enable the warnings for gcc. Change-Id: I3cc79e45749b2ae0f9bebb1acadc56a3d3a942da Reviewed-on: https://gem5-review.googlesource.com/9343 Reviewed-by: Andreas Sandberg Maintainer: Gabe Black --- src/arch/sparc/insts/nop.cc | 2 +- src/arch/sparc/insts/priv.hh | 16 ++++++++++------ src/arch/sparc/insts/static_inst.hh | 5 +++-- 3 files changed, 14 insertions(+), 9 deletions(-) (limited to 'src/arch/sparc/insts') diff --git a/src/arch/sparc/insts/nop.cc b/src/arch/sparc/insts/nop.cc index d1257907f..a45df64f4 100644 --- a/src/arch/sparc/insts/nop.cc +++ b/src/arch/sparc/insts/nop.cc @@ -57,7 +57,7 @@ output header {{ } std::string generateDisassembly(Addr pc, - const SymbolTable *symtab) const; + const SymbolTable *symtab) const override; }; }}; diff --git a/src/arch/sparc/insts/priv.hh b/src/arch/sparc/insts/priv.hh index 6530d09f8..c4681da07 100644 --- a/src/arch/sparc/insts/priv.hh +++ b/src/arch/sparc/insts/priv.hh @@ -46,7 +46,8 @@ class Priv : public SparcStaticInst { protected: using SparcStaticInst::SparcStaticInst; - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; class PrivReg : public Priv @@ -66,7 +67,8 @@ class RdPriv : public PrivReg { protected: using PrivReg::PrivReg; - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; // This class is for instructions that explicitly write control @@ -75,7 +77,8 @@ class WrPriv : public PrivReg { protected: using PrivReg::PrivReg; - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -103,11 +106,12 @@ class WrPrivImm : public PrivImm PrivImm(mnem, _machInst, __opClass), regName(_regName) {} - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; char const *regName; -} -; +}; + } #endif //__ARCH_SPARC_INSTS_PRIV_HH__ diff --git a/src/arch/sparc/insts/static_inst.hh b/src/arch/sparc/insts/static_inst.hh index 9e15c8dab..32930fb9f 100644 --- a/src/arch/sparc/insts/static_inst.hh +++ b/src/arch/sparc/insts/static_inst.hh @@ -90,7 +90,8 @@ class SparcStaticInst : public StaticInst protected: using StaticInst::StaticInst; - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; static void printMnemonic(std::ostream &os, const char *mnemonic); static void printReg(std::ostream &os, RegId reg); @@ -101,7 +102,7 @@ class SparcStaticInst : public StaticInst void printRegArray(std::ostream &os, const RegId indexArray[], int num) const; - void advancePC(PCState &pcState) const; + void advancePC(PCState &pcState) const override; static bool passesFpCondition(uint32_t fcc, uint32_t condition); static bool passesCondition(uint32_t codes, uint32_t condition); -- cgit v1.2.3