242c242
< inline void doSquash(const Addr &new_PC, unsigned tid);
---
> inline void doSquash(const Addr &new_PC, const Addr &new_NPC, unsigned tid);
247,248c247,248
< void squashFromDecode(const Addr &new_PC, const InstSeqNum &seq_num,
< unsigned tid);
---
> void squashFromDecode(const Addr &new_PC, const Addr &new_NPC,
> const InstSeqNum &seq_num, unsigned tid);
262c262,263
< void squash(const Addr &new_PC, const InstSeqNum &seq_num,
---
> void squash(const Addr &new_PC, const Addr &new_NPC,
> const InstSeqNum &seq_num,