summaryrefslogtreecommitdiff
path: root/cpu/o3/alpha_dyn_inst.hh
diff options
context:
space:
mode:
Diffstat (limited to 'cpu/o3/alpha_dyn_inst.hh')
-rw-r--r--cpu/o3/alpha_dyn_inst.hh14
1 files changed, 7 insertions, 7 deletions
diff --git a/cpu/o3/alpha_dyn_inst.hh b/cpu/o3/alpha_dyn_inst.hh
index b113d9487..f282c287c 100644
--- a/cpu/o3/alpha_dyn_inst.hh
+++ b/cpu/o3/alpha_dyn_inst.hh
@@ -69,7 +69,7 @@ class AlphaDynInst : public BaseDynInst<Impl>
AlphaDynInst(StaticInstPtr &_staticInst);
/** Executes the instruction.*/
- Fault * execute()
+ Fault execute()
{
return this->fault = this->staticInst->execute(this, this->traceData);
}
@@ -82,13 +82,13 @@ class AlphaDynInst : public BaseDynInst<Impl>
void setFpcr(uint64_t val);
#if FULL_SYSTEM
- uint64_t readIpr(int idx, Fault * &fault);
- Fault * setIpr(int idx, uint64_t val);
- Fault * hwrei();
+ uint64_t readIpr(int idx, Fault &fault);
+ Fault setIpr(int idx, uint64_t val);
+ Fault hwrei();
int readIntrFlag();
void setIntrFlag(int val);
bool inPalMode();
- void trap(Fault * fault);
+ void trap(Fault fault);
bool simPalCheck(int palFunc);
#else
void syscall();
@@ -215,12 +215,12 @@ class AlphaDynInst : public BaseDynInst<Impl>
}
public:
- Fault * calcEA()
+ Fault calcEA()
{
return this->staticInst->eaCompInst()->execute(this, this->traceData);
}
- Fault * memAccess()
+ Fault memAccess()
{
return this->staticInst->memAccInst()->execute(this, this->traceData);
}