29,30c29,30
< #ifndef __CPU_O3_CPU_CPU_POLICY_HH__
< #define __CPU_O3_CPU_CPU_POLICY_HH__
---
> #ifndef __CPU_O3_CPU_POLICY_HH__
> #define __CPU_O3_CPU_POLICY_HH__
35c35,36
< #include "cpu/o3/ldstq.hh"
---
> #include "cpu/o3/lsq.hh"
> #include "cpu/o3/lsq_unit.hh"
60c61,62
< typedef LDSTQ<Impl> LDSTQ;
---
> typedef LSQ<Impl> LSQ;
> typedef LSQUnit<Impl> LSQUnit;
62,66d63
< typedef SimpleFetch<Impl> Fetch;
< typedef SimpleDecode<Impl> Decode;
< typedef SimpleRename<Impl> Rename;
< typedef SimpleIEW<Impl> IEW;
< typedef SimpleCommit<Impl> Commit;
67a65,70
> typedef DefaultFetch<Impl> Fetch;
> typedef DefaultDecode<Impl> Decode;
> typedef DefaultRename<Impl> Rename;
> typedef DefaultIEW<Impl> IEW;
> typedef DefaultCommit<Impl> Commit;
>
69c72
< typedef SimpleFetchSimpleDecode<Impl> FetchStruct;
---
> typedef DefaultFetchDefaultDecode<Impl> FetchStruct;
72c75
< typedef SimpleDecodeSimpleRename<Impl> DecodeStruct;
---
> typedef DefaultDecodeDefaultRename<Impl> DecodeStruct;
75c78
< typedef SimpleRenameSimpleIEW<Impl> RenameStruct;
---
> typedef DefaultRenameDefaultIEW<Impl> RenameStruct;
78c81
< typedef SimpleIEWSimpleCommit<Impl> IEWStruct;
---
> typedef DefaultIEWDefaultCommit<Impl> IEWStruct;
84c87
< typedef TimeBufStruct TimeStruct;
---
> typedef TimeBufStruct<Impl> TimeStruct;
88c91
< #endif //__CPU_O3_CPU_CPU_POLICY_HH__
---
> #endif //__CPU_O3_CPU_POLICY_HH__