115c115
< DefaultDecode<Impl>::setCPU(FullCPU *cpu_ptr)
---
> DefaultDecode<Impl>::setCPU(O3CPU *cpu_ptr)
430c430
< cpu->activateStage(FullCPU::DecodeIdx);
---
> cpu->activateStage(O3CPU::DecodeIdx);
439c439
< cpu->deactivateStage(FullCPU::DecodeIdx);
---
> cpu->deactivateStage(O3CPU::DecodeIdx);