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/mem.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/mem.hh')
-rw-r--r-- | src/arch/arm/insts/mem.hh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/arch/arm/insts/mem.hh b/src/arch/arm/insts/mem.hh index ddd196676..da4dac3f3 100644 --- a/src/arch/arm/insts/mem.hh +++ b/src/arch/arm/insts/mem.hh @@ -60,7 +60,8 @@ class Swap : public PredOp dest(_dest), op1(_op1), base(_base) {} - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; class MightBeMicro : public PredOp @@ -118,13 +119,14 @@ class RfeOp : public MightBeMicro } StaticInstPtr - fetchMicroop(MicroPC microPC) const + fetchMicroop(MicroPC microPC) const override { assert(uops != NULL && microPC < numMicroops); return uops[microPC]; } - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; // The address is a base register plus an immediate. @@ -158,13 +160,14 @@ class SrsOp : public MightBeMicro } StaticInstPtr - fetchMicroop(MicroPC microPC) const + fetchMicroop(MicroPC microPC) const override { assert(uops != NULL && microPC < numMicroops); return uops[microPC]; } - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; class Memory : public MightBeMicro @@ -198,7 +201,7 @@ class Memory : public MightBeMicro } StaticInstPtr - fetchMicroop(MicroPC microPC) const + fetchMicroop(MicroPC microPC) const override { assert(uops != NULL && microPC < numMicroops); return uops[microPC]; |