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/macromem.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/macromem.hh')
| -rw-r--r-- | src/arch/arm/insts/macromem.hh | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/src/arch/arm/insts/macromem.hh b/src/arch/arm/insts/macromem.hh index 412337d06..b974e268e 100644 --- a/src/arch/arm/insts/macromem.hh +++ b/src/arch/arm/insts/macromem.hh @@ -73,7 +73,7 @@ class MicroOp : public PredOp public: void - advancePC(PCState &pcState) const + advancePC(PCState &pcState) const override { if (flags[IsLastMicroop]) { pcState.uEnd(); @@ -94,7 +94,7 @@ class MicroOpX : public ArmStaticInst public: void - advancePC(PCState &pcState) const + advancePC(PCState &pcState) const override { if (flags[IsLastMicroop]) { pcState.uEnd(); @@ -263,7 +263,8 @@ class MicroSetPCCPSR : public MicroOp { } - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -281,7 +282,8 @@ class MicroIntMov : public MicroOp { } - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -300,7 +302,8 @@ class MicroIntImmOp : public MicroOp { } - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; class MicroIntImmXOp : public MicroOpX @@ -316,7 +319,8 @@ class MicroIntImmXOp : public MicroOpX { } - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -334,7 +338,8 @@ class MicroIntOp : public MicroOp { } - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; class MicroIntRegXOp : public MicroOp @@ -353,7 +358,8 @@ class MicroIntRegXOp : public MicroOp { } - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -392,7 +398,8 @@ class MicroMemOp : public MicroIntImmOp { } - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; class MicroMemPairOp : public MicroOp @@ -412,7 +419,8 @@ class MicroMemPairOp : public MicroOp { } - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** |