358,360c358
< #if THE_ISA == ALPHA_ISA
< insts[tid].clear();
< #else
---
> #if ISA_HAS_DELAY_SLOT
371a370,371
> #else
> insts[tid].clear();
377,379c377
< #if THE_ISA == ALPHA_ISA
< skidBuffer[tid].clear();
< #else
---
> #if ISA_HAS_DELAY_SLOT
390a389,390
> #else
> skidBuffer[tid].clear();
746c746
< #if THE_ISA == ALPHA_ISA
---
> #if !ISA_HAS_DELAY_SLOT
1185,1187c1185
< #if THE_ISA == ALPHA_ISA
< InstSeqNum squashed_seq_num = fromCommit->commitInfo[tid].doneSeqNum;
< #else
---
> #if ISA_HAS_DELAY_SLOT
1188a1187,1188
> #else
> InstSeqNum squashed_seq_num = fromCommit->commitInfo[tid].doneSeqNum;