430,432c430
< #if THE_ISA == ALPHA_ISA
< ldstQueue.squash(fromCommit->commitInfo[tid].doneSeqNum, tid);
< #else
---
> #if ISA_HAS_DELAY_SLOT
433a432,433
> #else
> ldstQueue.squash(fromCommit->commitInfo[tid].doneSeqNum, tid);
442c442
< #if THE_ISA != ALPHA_ISA
---
> #if ISA_HAS_DELAY_SLOT
482,486c482
< #if THE_ISA == ALPHA_ISA
< toCommit->branchTaken[tid] = inst->readNextPC() !=
< (inst->readPC() + sizeof(TheISA::MachInst));
< toCommit->nextPC[tid] = inst->readNextPC();
< #else
---
> #if ISA_HAS_DELAY_SLOT
498a495,498
> #else
> toCommit->branchTaken[tid] = inst->readNextPC() !=
> (inst->readPC() + sizeof(TheISA::MachInst));
> toCommit->nextPC[tid] = inst->readNextPC();
863c863
< #if THE_ISA == ALPHA_ISA
---
> #if !ISA_HAS_DELAY_SLOT
881,882c881
<
< #if THE_ISA != ALPHA_ISA
---
> #if ISA_HAS_DELAY_SLOT
1319c1318
< #if THE_ISA == ALPHA_ISA
---
> #if ISA_HAS_DELAY_SLOT
1321c1320
< inst->nextPC);
---
> inst->nextNPC);
1324c1323
< inst->nextNPC);
---
> inst->nextPC);