sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update for changes to draining.

Browse source 
--HG--
extra : convert_revision : 5038dd8be72827f40cf89318db0b2bb4f9bbd864
This commit is contained in:
Kevin Lim 2006-07-13 13:08:58 -04:00
parent 63c999edef
commit a0a952d5ff
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/cpu/o3/cpu.cc
View file

@ -441,7 +441,7 @@ FullO3CPU<Impl>::tick()
if (!tickEvent.scheduled()) {
if (_status == SwitchedOut ||
getState() == SimObject::DrainedTiming) {
getState() == SimObject::Drained) {
// increment stat
lastRunningCycle = curTick;
} else if (!activityRec.active()) {
@ -803,7 +803,7 @@ FullO3CPU<Impl>::unserialize(Checkpoint *cp, const std::string &section)
}
template <class Impl>
bool
unsigned int
FullO3CPU<Impl>::drain(Event *drain_event)
{
drainCount = 0;
@ -815,7 +815,7 @@ FullO3CPU<Impl>::drain(Event *drain_event)
// Wake the CPU and record activity so everything can drain out if
// the CPU was not able to immediately drain.
if (getState() != SimObject::DrainedTiming) {
if (getState() != SimObject::Drained) {
// A bit of a hack...set the drainEvent after all the drain()
// calls have been made, that way if all of the stages drain
// immediately, the signalDrained() function knows not to call
@ -825,9 +825,9 @@ FullO3CPU<Impl>::drain(Event *drain_event)
wakeCPU();
activityRec.activity();
return false;
return 1;
} else {
return true;
return 0;
}
}
@ -835,19 +835,21 @@ template <class Impl>
void
FullO3CPU<Impl>::resume()
{
assert(system->getMemoryMode() == System::Timing);
fetch.resume();
decode.resume();
rename.resume();
iew.resume();
commit.resume();
changeState(SimObject::Running);
if (_status == SwitchedOut || _status == Idle)
return;
if (!tickEvent.scheduled())
tickEvent.schedule(curTick);
_status = Running;
changeState(SimObject::Timing);
}
template <class Impl>
@ -858,7 +860,7 @@ FullO3CPU<Impl>::signalDrained()
if (tickEvent.scheduled())
tickEvent.squash();
changeState(SimObject::DrainedTiming);
changeState(SimObject::Drained);
if (drainEvent) {
drainEvent->process();

2
src/cpu/o3/cpu.hh
View file

@ -330,7 +330,7 @@ class FullO3CPU : public BaseO3CPU
/** Starts draining the CPU's pipeline of all instructions in
* order to stop all memory accesses. */
virtual bool drain(Event *drain_event);
virtual unsigned int drain(Event *drain_event);
/** Resumes execution after a drain. */
virtual void resume();