diff -r 94c22ac99ab0 -r 28a693227898 src/cpu/base_dyn_inst.hh --- a/src/cpu/base_dyn_inst.hh Tue Jul 19 01:45:50 2011 -0700 +++ b/src/cpu/base_dyn_inst.hh Tue Jul 19 01:46:35 2011 -0700 @@ -381,16 +381,6 @@ 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 -r 94c22ac99ab0 -r 28a693227898 src/cpu/base_dyn_inst_impl.hh --- a/src/cpu/base_dyn_inst_impl.hh Tue Jul 19 01:45:50 2011 -0700 +++ b/src/cpu/base_dyn_inst_impl.hh Tue Jul 19 01:46:35 2011 -0700 @@ -90,21 +90,6 @@ } 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 -r 94c22ac99ab0 -r 28a693227898 src/cpu/o3/dyn_inst.hh --- a/src/cpu/o3/dyn_inst.hh Tue Jul 19 01:45:50 2011 -0700 +++ b/src/cpu/o3/dyn_inst.hh Tue Jul 19 01:46:35 2011 -0700 @@ -90,11 +90,6 @@ 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 -r 94c22ac99ab0 -r 28a693227898 src/cpu/o3/dyn_inst_impl.hh --- a/src/cpu/o3/dyn_inst_impl.hh Tue Jul 19 01:45:50 2011 -0700 +++ b/src/cpu/o3/dyn_inst_impl.hh Tue Jul 19 01:46:35 2011 -0700 @@ -53,15 +53,6 @@ } 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 -r 94c22ac99ab0 -r 28a693227898 src/cpu/ozone/dyn_inst_impl.hh --- a/src/cpu/ozone/dyn_inst_impl.hh Tue Jul 19 01:45:50 2011 -0700 +++ b/src/cpu/ozone/dyn_inst_impl.hh Tue Jul 19 01:46:35 2011 -0700 @@ -47,14 +47,6 @@ } 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) {