929c929,930
< this->trap(interrupt, 0);
---
> DynInstPtr dummyInst;
> this->trap(interrupt, 0, dummyInst);
946c947
< FullO3CPU<Impl>::trap(Fault fault, ThreadID tid)
---
> FullO3CPU<Impl>::trap(Fault fault, ThreadID tid, DynInstPtr inst)
949c950
< fault->invoke(this->threadContexts[tid]);
---
> fault->invoke(this->threadContexts[tid], inst->staticInst);