65c65
< ConditionRegisterState::exec(GPUStaticInst *ii, Wavefront *w)
---
> ConditionRegisterState::exec(GPUDynInstPtr ii, Wavefront *w)
72c72
< markReg(ii->getRegisterIndex(i), 1);
---
> markReg(ii->getRegisterIndex(i, ii), 1);
77c77
< registerEvent(w->simdId, ii->getRegisterIndex(i),
---
> registerEvent(w->simdId, ii->getRegisterIndex(i, ii),