diff options
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/o3/dyn_inst.hh | 19 | ||||
| -rw-r--r-- | src/cpu/static_inst.hh | 25 |
2 files changed, 0 insertions, 44 deletions
diff --git a/src/cpu/o3/dyn_inst.hh b/src/cpu/o3/dyn_inst.hh index 0643e7e30..8a0ae1d56 100644 --- a/src/cpu/o3/dyn_inst.hh +++ b/src/cpu/o3/dyn_inst.hh @@ -429,25 +429,6 @@ class BaseO3DynInst : public BaseDynInst<Impl> panic("MIPS MT not defined for O3 CPU.\n"); } #endif - - public: - /** Calculates EA part of a memory instruction. Currently unused, - * though it may be useful in the future if we want to split - * memory operations into EA calculation and memory access parts. - */ - Fault calcEA() - { - return this->staticInst->eaCompInst()->execute(this, this->traceData); - } - - /** Does the memory access part of a memory instruction. Currently unused, - * though it may be useful in the future if we want to split - * memory operations into EA calculation and memory access parts. - */ - Fault memAccess() - { - return this->staticInst->memAccInst()->execute(this, this->traceData); - } }; #endif // __CPU_O3_ALPHA_DYN_INST_HH__ diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh index a58df00c7..a4077e1d0 100644 --- a/src/cpu/static_inst.hh +++ b/src/cpu/static_inst.hh @@ -203,28 +203,8 @@ class StaticInst : public RefCounted, public StaticInstFlags const RegId& srcRegIdx(int i) const { return _srcRegIdx[i]; } /// Pointer to a statically allocated "null" instruction object. - /// Used to give eaCompInst() and memAccInst() something to return - /// when called on non-memory instructions. static StaticInstPtr nullStaticInstPtr; - /** - * Memory references only: returns "fake" instruction representing - * the effective address part of the memory operation. Used to - * obtain the dependence info (numSrcRegs and srcRegIdx[]) for - * just the EA computation. - */ - virtual const - StaticInstPtr &eaCompInst() const { return nullStaticInstPtr; } - - /** - * Memory references only: returns "fake" instruction representing - * the memory access part of the memory operation. Used to - * obtain the dependence info (numSrcRegs and srcRegIdx[]) for - * just the memory access (not the EA computation). - */ - virtual const - StaticInstPtr &memAccInst() const { return nullStaticInstPtr; } - /// The binary machine instruction. const ExtMachInst machInst; @@ -272,11 +252,6 @@ class StaticInst : public RefCounted, public StaticInstFlags virtual Fault execute(ExecContext *xc, Trace::InstRecord *traceData) const = 0; - virtual Fault eaComp(ExecContext *xc, - Trace::InstRecord *traceData) const - { - panic("eaComp not defined!"); - } virtual Fault initiateAcc(ExecContext *xc, Trace::InstRecord *traceData) const |