58c58
< typedef typename Impl::FullCPU FullCPU;
---
> typedef typename Impl::O3CPU O3CPU;
118c118
< void setCPU(FullCPU *cpu_ptr);
---
> void setCPU(O3CPU *cpu_ptr);
294c294
< FullCPU *cpu;
---
> O3CPU *cpu;