89,90c89,91
< O3ThreadState(FullCPU *_cpu, int _thread_num, Process *_process, int _asid)
< : ThreadState(-1, _thread_num, NULL, _process, _asid),
---
> O3ThreadState(FullCPU *_cpu, int _thread_num, Process *_process, int _asid,
> MemObject *mem)
> : ThreadState(-1, _thread_num, mem, _process, _asid),
93,98d93
<
< O3ThreadState(FullCPU *_cpu, int _thread_num, FunctionalMemory *_mem,
< int _asid)
< : ThreadState(-1, _thread_num, _mem, NULL, _asid),
< cpu(_cpu), inSyscall(0), trapPending(0)
< { }