diff options
| author | Gabe Black <gabeblack@google.com> | 2018-03-23 17:39:32 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2018-03-26 22:34:44 +0000 |
| commit | cdf3cc2b95137807672ef7b8057695a13ce1cc33 (patch) | |
| tree | 5d25308a7f9ded9c31f91968cd4e81d07c8e7e6b /src/arch/arm/insts/pseudo.hh | |
| parent | 740619f5d394da3816ff3fe6389cd7eb6ac55b8f (diff) | |
| download | gem5-cdf3cc2b95137807672ef7b8057695a13ce1cc33.tar.xz | |
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 <andreas.sandberg@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/arch/arm/insts/pseudo.hh')
| -rw-r--r-- | src/arch/arm/insts/pseudo.hh | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/arch/arm/insts/pseudo.hh b/src/arch/arm/insts/pseudo.hh index 5fb7499df..ececbbb86 100644 --- a/src/arch/arm/insts/pseudo.hh +++ b/src/arch/arm/insts/pseudo.hh @@ -56,9 +56,11 @@ class DecoderFaultInst : public ArmStaticInst public: DecoderFaultInst(ExtMachInst _machInst); - Fault execute(ExecContext *xc, Trace::InstRecord *traceData) const; + Fault execute(ExecContext *xc, + Trace::InstRecord *traceData) const override; - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -80,10 +82,11 @@ class FailUnimplemented : public ArmStaticInst FailUnimplemented(const char *_mnemonic, ExtMachInst _machInst, const std::string& _fullMnemonic); - Fault execute(ExecContext *xc, Trace::InstRecord *traceData) const; + Fault execute(ExecContext *xc, + Trace::InstRecord *traceData) const override; - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -109,10 +112,11 @@ class WarnUnimplemented : public ArmStaticInst WarnUnimplemented(const char *_mnemonic, ExtMachInst _machInst, const std::string& _fullMnemonic); - Fault execute(ExecContext *xc, Trace::InstRecord *traceData) const; + Fault execute(ExecContext *xc, + Trace::InstRecord *traceData) const override; - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -131,10 +135,11 @@ class McrMrcMiscInst : public ArmStaticInst McrMrcMiscInst(const char *_mnemonic, ExtMachInst _machInst, uint64_t _iss, MiscRegIndex _miscReg); - Fault execute(ExecContext *xc, Trace::InstRecord *traceData) const; + Fault execute(ExecContext *xc, + Trace::InstRecord *traceData) const override; - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; @@ -148,10 +153,11 @@ class McrMrcImplDefined : public McrMrcMiscInst McrMrcImplDefined(const char *_mnemonic, ExtMachInst _machInst, uint64_t _iss, MiscRegIndex _miscReg); - Fault execute(ExecContext *xc, Trace::InstRecord *traceData) const; + Fault execute(ExecContext *xc, + Trace::InstRecord *traceData) const override; - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; |