summaryrefslogtreecommitdiff
path: root/src/arch/power
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/power')
-rw-r--r--src/arch/power/insts/branch.hh15
-rw-r--r--src/arch/power/linux/process.hh2
-rw-r--r--src/arch/power/process.hh2
3 files changed, 19 insertions, 0 deletions
diff --git a/src/arch/power/insts/branch.hh b/src/arch/power/insts/branch.hh
index 1947e4ec3..762e55a66 100644
--- a/src/arch/power/insts/branch.hh
+++ b/src/arch/power/insts/branch.hh
@@ -88,6 +88,9 @@ class BranchPCRel : public PCDependentDisassembly
PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const;
+ /// Explicitly import the otherwise hidden branchTarget
+ using StaticInst::branchTarget;
+
std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
};
@@ -114,6 +117,9 @@ class BranchNonPCRel : public PCDependentDisassembly
PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const;
+ /// Explicitly import the otherwise hidden branchTarget
+ using StaticInst::branchTarget;
+
std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
};
@@ -189,6 +195,9 @@ class BranchPCRelCond : public BranchCond
PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const;
+ /// Explicitly import the otherwise hidden branchTarget
+ using StaticInst::branchTarget;
+
std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
};
@@ -215,6 +224,9 @@ class BranchNonPCRelCond : public BranchCond
PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const;
+ /// Explicitly import the otherwise hidden branchTarget
+ using StaticInst::branchTarget;
+
std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
};
@@ -233,6 +245,9 @@ class BranchRegCond : public BranchCond
PowerISA::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/power/linux/process.hh b/src/arch/power/linux/process.hh
index c4600129e..e3f3071b8 100644
--- a/src/arch/power/linux/process.hh
+++ b/src/arch/power/linux/process.hh
@@ -46,6 +46,8 @@ class PowerLinuxProcess : public PowerLiveProcess
void initState();
PowerISA::IntReg getSyscallArg(ThreadContext *tc, int &i);
+ /// Explicitly import the otherwise hidden getSyscallArg
+ using LiveProcess::getSyscallArg;
void setSyscallArg(ThreadContext *tc, int i, PowerISA::IntReg val);
/// Array of syscall descriptors, indexed by call number.
diff --git a/src/arch/power/process.hh b/src/arch/power/process.hh
index e02a30abd..977b75ae8 100644
--- a/src/arch/power/process.hh
+++ b/src/arch/power/process.hh
@@ -52,6 +52,8 @@ class PowerLiveProcess : public LiveProcess
public:
void argsInit(int intSize, int pageSize);
PowerISA::IntReg getSyscallArg(ThreadContext *tc, int &i);
+ /// Explicitly import the otherwise hidden getSyscallArg
+ using LiveProcess::getSyscallArg;
void setSyscallArg(ThreadContext *tc, int i, PowerISA::IntReg val);
void setSyscallReturn(ThreadContext *tc, SyscallReturn return_value);
};