78a79
> StaticInstPtr _macroop,
81c82
< : staticInst(_staticInst), traceData(NULL), cpu(cpu)
---
> : staticInst(_staticInst), macroop(_macroop), traceData(NULL), cpu(cpu)
93,94c94,96
< BaseDynInst<Impl>::BaseDynInst(StaticInstPtr &_staticInst)
< : staticInst(_staticInst), traceData(NULL)
---
> BaseDynInst<Impl>::BaseDynInst(StaticInstPtr _staticInst,
> StaticInstPtr _macroop)
> : staticInst(_staticInst), macroop(_macroop), traceData(NULL)