207c207,208
< #if USE_CHECKER
---
> checker = NULL;
>
208a210
> #if USE_CHECKER
214,216c216,217
< } else {
< checker = NULL;
< }
---
> #else
> panic("Checker enabled but not compiled in!");
217a219
> }
385c387
< cpi = numCycles / committedInsts;
---
> cpi = simTicks / committedInsts;
391c393
< totalCpi = numCycles / totalCommittedInsts;
---
> totalCpi = simTicks / totalCommittedInsts;
397c399
< ipc = committedInsts / numCycles;
---
> ipc = committedInsts / simTicks;
403c405
< totalIpc = totalCommittedInsts / numCycles;
---
> totalIpc = totalCommittedInsts / simTicks;
697c699
< fetch.squash(0, sizeof(TheISA::MachInst), squash_seq_num, true, tid);
---
> fetch.squash(0, sizeof(TheISA::MachInst), squash_seq_num, tid);
1227,1229c1229
< FullO3CPU<Impl>::removeInstsNotInROB(unsigned tid,
< bool squash_delay_slot,
< const InstSeqNum &delay_slot_seq_num)
---
> FullO3CPU<Impl>::removeInstsNotInROB(unsigned tid)
1260,1265d1259
< #if ISA_HAS_DELAY_SLOT
< if(!squash_delay_slot &&
< delay_slot_seq_num >= (*inst_it)->seqNum) {
< break;
< }
< #endif