summaryrefslogtreecommitdiff
path: root/src/arch/mips/isa
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2013-02-19 05:56:06 -0500
committerAndreas Hansson <andreas.hansson@arm.com>2013-02-19 05:56:06 -0500
commit0acd2a96e5cd2a9bece4d5468dd1a8cc96c8aafe (patch)
tree0feaa85408e6aba2d4e4b3ad12b7dd4a98e27ed9 /src/arch/mips/isa
parentd670fa60a105676a19dd91440f66dc186450b3e8 (diff)
downloadgem5-0acd2a96e5cd2a9bece4d5468dd1a8cc96c8aafe.tar.xz
scons: Add warning for overloaded virtual functions
A derived function with a different signature than a base class function will result in the base class function of the same name being hidden. The parameter list and return type for the member function in the derived class must match those of the member function in the base class, otherwise the function in the derived class will hide the function in the base class and no polymorphic behaviour will occur. This patch addresses these warnings by ensuring a unique function name to avoid (unintentionally) hiding any functions.
Diffstat (limited to 'src/arch/mips/isa')
-rw-r--r--src/arch/mips/isa/formats/branch.isa6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/arch/mips/isa/formats/branch.isa b/src/arch/mips/isa/formats/branch.isa
index ecc62d75d..f826e1083 100644
--- a/src/arch/mips/isa/formats/branch.isa
+++ b/src/arch/mips/isa/formats/branch.isa
@@ -91,6 +91,9 @@ output header {{
MipsISA::PCState branchTarget(const MipsISA::PCState &branchPC) const;
+ /// Explicitly import the otherwise hidden branchTarget
+ using StaticInst::branchTarget;
+
std::string
generateDisassembly(Addr pc, const SymbolTable *symtab) const;
};
@@ -118,6 +121,9 @@ output header {{
MipsISA::PCState branchTarget(ThreadContext *tc) const;
+ /// Explicitly import the otherwise hidden branchTarget
+ using StaticInst::branchTarget;
+
std::string
generateDisassembly(Addr pc, const SymbolTable *symtab) const;
};