only do this assert after you know you're not switched out or idle.
--HG-- extra : convert_revision : 0cd0d31db44fe7e8e44bde90e1756873faca422f
This commit is contained in:
parent
0e2561710b
commit
c2c48645c9
1 changed files with 4 additions and 3 deletions
|
@ -850,9 +850,6 @@ template <class Impl>
|
||||||
void
|
void
|
||||||
FullO3CPU<Impl>::resume()
|
FullO3CPU<Impl>::resume()
|
||||||
{
|
{
|
||||||
#if FULL_SYSTEM
|
|
||||||
assert(system->getMemoryMode() == System::Timing);
|
|
||||||
#endif
|
|
||||||
fetch.resume();
|
fetch.resume();
|
||||||
decode.resume();
|
decode.resume();
|
||||||
rename.resume();
|
rename.resume();
|
||||||
|
@ -864,6 +861,10 @@ FullO3CPU<Impl>::resume()
|
||||||
if (_status == SwitchedOut || _status == Idle)
|
if (_status == SwitchedOut || _status == Idle)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
#if FULL_SYSTEM
|
||||||
|
assert(system->getMemoryMode() == System::Timing);
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!tickEvent.scheduled())
|
if (!tickEvent.scheduled())
|
||||||
tickEvent.schedule(curTick);
|
tickEvent.schedule(curTick);
|
||||||
_status = Running;
|
_status = Running;
|
||||||
|
|
Loading…
Reference in a new issue