120c120
< : Event(&mainEventQueue, CPU_Tick_Pri), tid(0), remove(false), cpu(NULL)
---
> : Event(&mainEventQueue, CPU_Tick_Pri)
127c127
< FullO3CPU<Impl> *thread_cpu)
---
> FullO3CPU<Impl> *thread_cpu)
131d130
< remove = false;
152a152,155
> #if FULL_SYSTEM
> itb(params->itb),
> dtb(params->dtb),
> #endif
610,611c613
< if (activeThreads.size() == 1 && !deallocated ||
< activeThreads.size() == 0)
---
> if ((activeThreads.size() == 1 && !deallocated) || activeThreads.size() == 0)
660d661
< #if ISA_HAS_DELAY_SLOT
662d662
< #endif
701c701
< fetch.squash(0, squash_seq_num, true, tid);
---
> fetch.squash(0, sizeof(TheISA::MachInst), squash_seq_num, true, tid);