61c61
< typedef typename Impl::FullCPU FullCPU;
---
> typedef typename Impl::O3CPU O3CPU;
65c65
< FullCPU *cpu;
---
> O3CPU *cpu;
78c78
< O3ThreadState(FullCPU *_cpu, int _thread_num)
---
> O3ThreadState(O3CPU *_cpu, int _thread_num)
83c83
< O3ThreadState(FullCPU *_cpu, int _thread_num, Process *_process, int _asid,
---
> O3ThreadState(O3CPU *_cpu, int _thread_num, Process *_process, int _asid,