120c120
< : Event(&mainEventQueue, CPU_Tick_Pri)
---
> : Event(&mainEventQueue, CPU_Tick_Pri), tid(0), remove(false), cpu(NULL)
127c127
< FullO3CPU<Impl> *thread_cpu)
---
> FullO3CPU<Impl> *thread_cpu)
130a131
> remove = false;
152,155d152
< #if FULL_SYSTEM
< itb(params->itb),
< dtb(params->dtb),
< #endif
613c610,611
< if ((activeThreads.size() == 1 && !deallocated) || activeThreads.size() == 0)
---
> if (activeThreads.size() == 1 && !deallocated ||
> activeThreads.size() == 0)
703c701
< fetch.squash(0, sizeof(TheISA::MachInst), squash_seq_num, true, tid);
---
> fetch.squash(0, squash_seq_num, true, tid);