483d482
< #if ISA_HAS_DELAY_SLOT
484a484
> #if ISA_HAS_DELAY_SLOT
505c505
< } else
---
> } else {
506a507,508
> toCommit->nextNPC[tid] = inst->readNextNPC() + instSize;
> }
510a513
> toCommit->nextNPC[tid] = inst->readNextPC() + instSize;
529a533,534
> #else
> toCommit->nextNPC[tid] = inst->readNextPC() + sizeof(TheISA::MachInst);
549a555,556
> #else
> toCommit->nextNPC[tid] = inst->readPC() + sizeof(TheISA::MachInst);
1358,1365c1365,1369
< DPRINTF(IEW, "Predicted target was %#x.\n", inst->predPC);
< #if ISA_HAS_DELAY_SLOT
< DPRINTF(IEW, "Execute: Redirecting fetch to PC: %#x.\n",
< inst->nextNPC);
< #else
< DPRINTF(IEW, "Execute: Redirecting fetch to PC: %#x.\n",
< inst->nextPC);
< #endif
---
> DPRINTF(IEW, "Predicted target was %#x, %#x.\n",
> inst->readPredPC(), inst->readPredNPC());
> DPRINTF(IEW, "Execute: Redirecting fetch to PC: %#x,"
> " NPC: %#x.\n", inst->readNextPC(),
> inst->readNextNPC());