summaryrefslogtreecommitdiff
path: root/src/arch/mips
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/mips')
-rw-r--r--src/arch/mips/isa/formats/branch.isa6
-rw-r--r--src/arch/mips/process.hh2
2 files changed, 8 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;
};
diff --git a/src/arch/mips/process.hh b/src/arch/mips/process.hh
index 3f9a7aff0..a126344ca 100644
--- a/src/arch/mips/process.hh
+++ b/src/arch/mips/process.hh
@@ -53,6 +53,8 @@ class MipsLiveProcess : public LiveProcess
public:
MipsISA::IntReg getSyscallArg(ThreadContext *tc, int &i);
+ /// Explicitly import the otherwise hidden getSyscallArg
+ using LiveProcess::getSyscallArg;
void setSyscallArg(ThreadContext *tc, int i, MipsISA::IntReg val);
void setSyscallReturn(ThreadContext *tc, SyscallReturn return_value);
};