summaryrefslogtreecommitdiff
path: root/src/arch/alpha
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/alpha')
-rw-r--r--src/arch/alpha/isa/branch.isa6
-rw-r--r--src/arch/alpha/process.hh2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/arch/alpha/isa/branch.isa b/src/arch/alpha/isa/branch.isa
index def6f3c1d..b60cb6d1e 100644
--- a/src/arch/alpha/isa/branch.isa
+++ b/src/arch/alpha/isa/branch.isa
@@ -83,6 +83,9 @@ output header {{
AlphaISA::PCState branchTarget(const AlphaISA::PCState &branchPC) const;
+ /// Explicitly import the otherwise hidden branchTarget
+ using StaticInst::branchTarget;
+
std::string
generateDisassembly(Addr pc, const SymbolTable *symtab) const;
};
@@ -108,6 +111,9 @@ output header {{
AlphaISA::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/alpha/process.hh b/src/arch/alpha/process.hh
index 40d6bf48a..8c8288341 100644
--- a/src/arch/alpha/process.hh
+++ b/src/arch/alpha/process.hh
@@ -49,6 +49,8 @@ class AlphaLiveProcess : public LiveProcess
public:
AlphaISA::IntReg getSyscallArg(ThreadContext *tc, int &i);
+ /// Explicitly import the otherwise hidden getSyscallArg
+ using LiveProcess::getSyscallArg;
void setSyscallArg(ThreadContext *tc, int i, AlphaISA::IntReg val);
void setSyscallReturn(ThreadContext *tc, SyscallReturn return_value);
};