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/pred_inst.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/pred_inst.hh')
-rw-r--r-- | src/arch/arm/insts/pred_inst.hh | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/arch/arm/insts/pred_inst.hh b/src/arch/arm/insts/pred_inst.hh index ce4d41bac..d2a9f7080 100644 --- a/src/arch/arm/insts/pred_inst.hh +++ b/src/arch/arm/insts/pred_inst.hh @@ -223,7 +223,8 @@ class PredImmOp : public PredOp rotated_carry = bits(rotated_imm, 31); } - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -243,7 +244,8 @@ class PredIntOp : public PredOp { } - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; class DataImmOp : public PredOp @@ -261,7 +263,8 @@ class DataImmOp : public PredOp dest(_dest), op1(_op1), imm(_imm), rotC(_rotC) {} - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; class DataRegOp : public PredOp @@ -279,7 +282,8 @@ class DataRegOp : public PredOp shiftAmt(_shiftAmt), shiftType(_shiftType) {} - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; class DataRegRegOp : public PredOp @@ -296,7 +300,8 @@ class DataRegRegOp : public PredOp shiftType(_shiftType) {} - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -327,19 +332,20 @@ class PredMacroOp : public PredOp } StaticInstPtr - fetchMicroop(MicroPC microPC) const + fetchMicroop(MicroPC microPC) const override { assert(microPC < numMicroops); return microOps[microPC]; } Fault - execute(ExecContext *, Trace::InstRecord *) const + execute(ExecContext *, Trace::InstRecord *) const override { panic("Execute method called when it shouldn't!"); } - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** |