831a832,833
> (*inst_it).second->setAtCommit();
>
962a965,966
> DPRINTF(IQ, "Rescheduling mem inst [sn:%lli]\n", resched_inst->seqNum);
> resched_inst->clearCanIssue();
987d990
<
1087c1090,1091
< } else if (!squashed_inst->isStoreConditional() || !squashed_inst->isCompleted()) {
---
> } else if (!squashed_inst->isStoreConditional() ||
> !squashed_inst->isCompleted()) {
1090a1095,1097
> if (ns_inst_it == nonSpecInsts.end()) {
> assert(squashed_inst->getFault() != NoFault);
> } else {
1092c1099
< (*ns_inst_it).second = NULL;
---
> (*ns_inst_it).second = NULL;
1094c1101
< nonSpecInsts.erase(ns_inst_it);
---
> nonSpecInsts.erase(ns_inst_it);
1096c1103,1104
< ++iqSquashedNonSpecRemoved;
---
> ++iqSquashedNonSpecRemoved;
> }