diff options
| author | Ali Saidi <Ali.Saidi@ARM.com> | 2011-07-10 12:56:08 -0500 |
|---|---|---|
| committer | Ali Saidi <Ali.Saidi@ARM.com> | 2011-07-10 12:56:08 -0500 |
| commit | 60579e8d74cecea5737a4502599ccf77e9e6a35e (patch) | |
| tree | 34e86b09774b7a10ba1948b189d00006d19ed684 /src/cpu/o3/cpu.cc | |
| parent | 9751a1d3e78cbbcd17835ab967f036945ee2cec2 (diff) | |
| download | gem5-60579e8d74cecea5737a4502599ccf77e9e6a35e.tar.xz | |
O3: Make sure fetch doesn't go off into the weeds during speculation.
Diffstat (limited to 'src/cpu/o3/cpu.cc')
| -rw-r--r-- | src/cpu/o3/cpu.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc index b19e4f460..cd4a3e867 100644 --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -46,10 +46,10 @@ #include "enums/MemoryMode.hh" #include "sim/core.hh" #include "sim/stat_control.hh" +#include "sim/system.hh" #if FULL_SYSTEM #include "cpu/quiesce_event.hh" -#include "sim/system.hh" #else #include "sim/process.hh" #endif @@ -204,9 +204,7 @@ FullO3CPU<Impl>::FullO3CPU(DerivO3CPUParams *params) params->activity), globalSeqNum(1), -#if FULL_SYSTEM system(params->system), -#endif // FULL_SYSTEM drainCount(0), deferRegistration(params->defer_registration) { @@ -1105,9 +1103,7 @@ FullO3CPU<Impl>::resume() if (_status == SwitchedOut || _status == Idle) return; -#if FULL_SYSTEM assert(system->getMemoryMode() == Enums::timing); -#endif if (!tickEvent.scheduled()) schedule(tickEvent, nextCycle()); |