516a517
> toCommit->branchMispredict[tid] = false;
532a534
> toCommit->branchMispredict[tid] = false;
1294c1296,1297
< DPRINTF(IEW, "Store has fault! [sn:%lli]\n", inst->seqNum);
---
> DPRINTF(IEW, "Store has fault %s! [sn:%lli]\n",
> fault->name(), inst->seqNum);
1331c1334,1335
< if (!fetchRedirect[tid]) {
---
> if (!fetchRedirect[tid] ||
> toCommit->squashedSeqNum[tid] > inst->seqNum) {
1353,1354d1356
< fetchRedirect[tid] = true;
<
1364a1367,1374
> // Ensure the violating instruction is older than
> // current squash
> if (fetchRedirect[tid] &&
> violator->seqNum >= toCommit->squashedSeqNum[tid])
> continue;
>
> fetchRedirect[tid] = true;
>