75a76
> bdelayDoneSeqNum[i] = 0;
430a432
> #if THE_ISA == ALPHA_ISA
432c434,436
<
---
> #else
> ldstQueue.squash(fromCommit->commitInfo[tid].bdelayDoneSeqNum, tid);
> #endif
436c440,441
< while (!skidBuffer[tid].empty()) {
---
> DPRINTF(IEW, "[tid:%i]: Removing skidbuffer instructions until [sn:%i].\n",
> tid, fromCommit->commitInfo[tid].bdelayDoneSeqNum);
437a443,456
> while (!skidBuffer[tid].empty()) {
> #if THE_ISA != ALPHA_ISA
> if (skidBuffer[tid].front()->seqNum <=
> fromCommit->commitInfo[tid].bdelayDoneSeqNum) {
> DPRINTF(IEW, "[tid:%i]: Cannot remove skidbuffer instructions "
> "that occur before delay slot [sn:%i].\n",
> fromCommit->commitInfo[tid].bdelayDoneSeqNum,
> tid);
> break;
> } else {
> DPRINTF(IEW, "[tid:%i]: Removing instruction [sn:%i] from "
> "skidBuffer.\n", tid, skidBuffer[tid].front()->seqNum);
> }
> #endif
447a467,468
> bdelayDoneSeqNum[tid] = fromCommit->commitInfo[tid].bdelayDoneSeqNum;
>
461d481
< toCommit->nextPC[tid] = inst->readNextPC();
462a483,484
>
> #if THE_ISA == ALPHA_ISA
464a487,490
> toCommit->nextPC[tid] = inst->readNextPC();
> #else
> bool branch_taken = inst->readNextNPC() !=
> (inst->readNextPC() + sizeof(TheISA::MachInst));
465a492,502
> toCommit->branchTaken[tid] = branch_taken;
>
> toCommit->condDelaySlotBranch[tid] = inst->isCondDelaySlot();
>
> if (inst->isCondDelaySlot() && branch_taken) {
> toCommit->nextPC[tid] = inst->readNextPC();
> } else {
> toCommit->nextPC[tid] = inst->readNextNPC();
> }
> #endif
>
827a865
> #if THE_ISA == ALPHA_ISA
830a869
> #endif
839a879,881
> DPRINTF(IEW, "[tid:%i]: Removing incoming rename instructions until "
> "[sn:%i].\n", tid, bdelayDoneSeqNum[tid]);
>
840a883,895
>
> #if THE_ISA != ALPHA_ISA
> if (insts[tid].front()->seqNum <= bdelayDoneSeqNum[tid]) {
> DPRINTF(IEW, "[tid:%i]: Done removing, cannot remove instruction"
> " that occurs at or before delay slot [sn:%i].\n",
> tid, bdelayDoneSeqNum[tid]);
> break;
> } else {
> DPRINTF(IEW, "[tid:%i]: Removing incoming rename instruction "
> "[sn:%i].\n", tid, insts[tid].front()->seqNum);
> }
> #endif
>
1123c1178
< DPRINTF(IEW,"[tid:%i]: Issue: Bandwidth Full. Blocking.\n");
---
> DPRINTF(IEW,"[tid:%i]: Issue: Bandwidth Full. Blocking.\n", tid);
1265a1321
> #if THE_ISA == ALPHA_ISA
1268c1324,1327
<
---
> #else
> DPRINTF(IEW, "Execute: Redirecting fetch to PC: %#x.\n",
> inst->nextNPC);
> #endif