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/power/insts/branch.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/power/insts/branch.hh')
| -rw-r--r-- | src/arch/power/insts/branch.hh | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/arch/power/insts/branch.hh b/src/arch/power/insts/branch.hh index 762e55a66..b368fed88 100644 --- a/src/arch/power/insts/branch.hh +++ b/src/arch/power/insts/branch.hh @@ -86,12 +86,13 @@ class BranchPCRel : public PCDependentDisassembly } } - PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const; + PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const override; /// Explicitly import the otherwise hidden branchTarget using StaticInst::branchTarget; - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -115,12 +116,13 @@ class BranchNonPCRel : public PCDependentDisassembly } } - PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const; + PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const override; /// Explicitly import the otherwise hidden branchTarget using StaticInst::branchTarget; - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -193,12 +195,13 @@ class BranchPCRelCond : public BranchCond } } - PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const; + PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const override; /// Explicitly import the otherwise hidden branchTarget using StaticInst::branchTarget; - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -222,12 +225,13 @@ class BranchNonPCRelCond : public BranchCond } } - PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const; + PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const override; /// Explicitly import the otherwise hidden branchTarget using StaticInst::branchTarget; - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -243,12 +247,13 @@ class BranchRegCond : public BranchCond { } - PowerISA::PCState branchTarget(ThreadContext *tc) const; + PowerISA::PCState branchTarget(ThreadContext *tc) const override; /// Explicitly import the otherwise hidden branchTarget using StaticInst::branchTarget; - std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; } // namespace PowerISA |