derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename quiesce to drain to avoid confusion with the pseudo instruction.

Browse Source 
src/cpu/simple/timing.cc:
src/cpu/simple/timing.hh:
src/python/m5/__init__.py:
src/python/m5/config.py:
src/sim/main.cc:
src/sim/sim_events.cc:
src/sim/sim_events.hh:
src/sim/sim_object.cc:
src/sim/sim_object.hh:
    Rename quiesce to drain.

--HG--
extra : convert_revision : fc3244a3934812e1edb8050f1f51f30382baf774
This commit is contained in:
Kevin Lim
2006-07-05 17:59:33 -04:00
parent bd26dbdb13
commit d8fd09cc15
9 changed files with 61 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/sim/sim_object.cc
View File

@@ -271,22 +271,22 @@ SimObject::recordEvent(const std::string &stat)
}
bool
SimObject::quiesce(Event *quiesce_event)
SimObject::drain(Event *drain_event)
{
if (state != QuiescedAtomic && state != Atomic) {
panic("Must implement your own quiesce function if it is to be used "
if (state != DrainedAtomic && state != Atomic) {
panic("Must implement your own drain function if it is to be used "
"in timing mode!");
}
state = QuiescedAtomic;
state = DrainedAtomic;
return false;
}
void
SimObject::resume()
{
if (state == QuiescedAtomic) {
if (state == DrainedAtomic) {
state = Atomic;
} else if (state == QuiescedTiming) {
} else if (state == DrainedTiming) {
state = Timing;
}
}
@@ -295,10 +295,10 @@ void
SimObject::setMemoryMode(State new_mode)
{
assert(new_mode == Timing || new_mode == Atomic);
if (state == QuiescedAtomic && new_mode == Timing) {
state = QuiescedTiming;
} else if (state == QuiescedTiming && new_mode == Atomic) {
state = QuiescedAtomic;
if (state == DrainedAtomic && new_mode == Timing) {
state = DrainedTiming;
} else if (state == DrainedTiming && new_mode == Atomic) {
state = DrainedAtomic;
} else {
state = new_mode;
}