diff --git a/src/cpu/base_dyn_inst.hh b/src/cpu/base_dyn_inst.hh index f0d36cc837..18a178c4a9 100644 --- a/src/cpu/base_dyn_inst.hh +++ b/src/cpu/base_dyn_inst.hh @@ -380,16 +380,6 @@ class BaseDynInst : public FastAlloc, public RefCounted BaseDynInst(StaticInstPtr staticInst, TheISA::PCState pc, TheISA::PCState predPC, InstSeqNum seq_num, ImplCPU *cpu); - /** BaseDynInst constructor given a binary instruction. - * @param inst The binary instruction. - * @param _pc The PC state for the instruction. - * @param _predPC The predicted next PC state for the instruction. - * @param seq_num The sequence number of the instruction. - * @param cpu Pointer to the instruction's CPU. - */ - BaseDynInst(TheISA::ExtMachInst inst, TheISA::PCState pc, - TheISA::PCState predPC, InstSeqNum seq_num, ImplCPU *cpu); - /** BaseDynInst constructor given a StaticInst pointer. * @param _staticInst The StaticInst for this BaseDynInst. */ diff --git a/src/cpu/base_dyn_inst_impl.hh b/src/cpu/base_dyn_inst_impl.hh index 226291e1df..bae0479124 100644 --- a/src/cpu/base_dyn_inst_impl.hh +++ b/src/cpu/base_dyn_inst_impl.hh @@ -89,21 +89,6 @@ BaseDynInst::BaseDynInst(StaticInstPtr _staticInst, initVars(); } -template -BaseDynInst::BaseDynInst(TheISA::ExtMachInst inst, - TheISA::PCState _pc, TheISA::PCState _predPC, - InstSeqNum seq_num, ImplCPU *cpu) - : staticInst(inst, _pc.instAddr()), traceData(NULL), cpu(cpu) -{ - seqNum = seq_num; - - pc = _pc; - predPC = _predPC; - predTaken = false; - - initVars(); -} - template BaseDynInst::BaseDynInst(StaticInstPtr &_staticInst) : staticInst(_staticInst), traceData(NULL) diff --git a/src/cpu/o3/dyn_inst.hh b/src/cpu/o3/dyn_inst.hh index 5fe1b26094..dc2d32eac2 100644 --- a/src/cpu/o3/dyn_inst.hh +++ b/src/cpu/o3/dyn_inst.hh @@ -90,11 +90,6 @@ class BaseO3DynInst : public BaseDynInst TheISA::PCState pc, TheISA::PCState predPC, InstSeqNum seq_num, O3CPU *cpu); - /** BaseDynInst constructor given a binary instruction. */ - BaseO3DynInst(ExtMachInst inst, - TheISA::PCState pc, TheISA::PCState predPC, - InstSeqNum seq_num, O3CPU *cpu); - /** BaseDynInst constructor given a static inst pointer. */ BaseO3DynInst(StaticInstPtr &_staticInst); diff --git a/src/cpu/o3/dyn_inst_impl.hh b/src/cpu/o3/dyn_inst_impl.hh index 9216c5fa7e..44b3532536 100644 --- a/src/cpu/o3/dyn_inst_impl.hh +++ b/src/cpu/o3/dyn_inst_impl.hh @@ -52,15 +52,6 @@ BaseO3DynInst::BaseO3DynInst(StaticInstPtr staticInst, initVars(); } -template -BaseO3DynInst::BaseO3DynInst(ExtMachInst inst, - TheISA::PCState pc, TheISA::PCState predPC, - InstSeqNum seq_num, O3CPU *cpu) - : BaseDynInst(inst, pc, predPC, seq_num, cpu) -{ - initVars(); -} - template BaseO3DynInst::BaseO3DynInst(StaticInstPtr &_staticInst) : BaseDynInst(_staticInst) diff --git a/src/cpu/ozone/dyn_inst_impl.hh b/src/cpu/ozone/dyn_inst_impl.hh index 002b39fa26..5eb8ea8daf 100644 --- a/src/cpu/ozone/dyn_inst_impl.hh +++ b/src/cpu/ozone/dyn_inst_impl.hh @@ -46,14 +46,6 @@ OzoneDynInst::OzoneDynInst(OzoneCPU *cpu) initInstPtrs(); } -template -OzoneDynInst::OzoneDynInst(ExtMachInst inst, Addr PC, Addr Pred_PC, - InstSeqNum seq_num, OzoneCPU *cpu) - : BaseDynInst(inst, PC, Pred_PC, seq_num, cpu) -{ - initInstPtrs(); -} - template OzoneDynInst::OzoneDynInst(StaticInstPtr _staticInst) : BaseDynInst(_staticInst)