26a27,28
> *
> * Authors: Kevin Lim
29,30c31,32
< #ifndef __CPU_O3_CPU_POLICY_HH__
< #define __CPU_O3_CPU_POLICY_HH__
---
> #ifndef __CPU_O3_CPU_CPU_POLICY_HH__
> #define __CPU_O3_CPU_CPU_POLICY_HH__
35,36c37
< #include "cpu/o3/lsq.hh"
< #include "cpu/o3/lsq_unit.hh"
---
> #include "cpu/o3/ldstq.hh"
61,62c62
< typedef LSQ<Impl> LSQ;
< typedef LSQUnit<Impl> LSQUnit;
---
> typedef LDSTQ<Impl> LDSTQ;
63a64,68
> typedef SimpleFetch<Impl> Fetch;
> typedef SimpleDecode<Impl> Decode;
> typedef SimpleRename<Impl> Rename;
> typedef SimpleIEW<Impl> IEW;
> typedef SimpleCommit<Impl> Commit;
65,70d69
< typedef DefaultFetch<Impl> Fetch;
< typedef DefaultDecode<Impl> Decode;
< typedef DefaultRename<Impl> Rename;
< typedef DefaultIEW<Impl> IEW;
< typedef DefaultCommit<Impl> Commit;
<
72c71
< typedef DefaultFetchDefaultDecode<Impl> FetchStruct;
---
> typedef SimpleFetchSimpleDecode<Impl> FetchStruct;
75c74
< typedef DefaultDecodeDefaultRename<Impl> DecodeStruct;
---
> typedef SimpleDecodeSimpleRename<Impl> DecodeStruct;
78c77
< typedef DefaultRenameDefaultIEW<Impl> RenameStruct;
---
> typedef SimpleRenameSimpleIEW<Impl> RenameStruct;
81c80
< typedef DefaultIEWDefaultCommit<Impl> IEWStruct;
---
> typedef SimpleIEWSimpleCommit<Impl> IEWStruct;
87c86
< typedef TimeBufStruct<Impl> TimeStruct;
---
> typedef TimeBufStruct TimeStruct;
91c90
< #endif //__CPU_O3_CPU_POLICY_HH__
---
> #endif //__CPU_O3_CPU_CPU_POLICY_HH__