diff options
| author | Steve Reinhardt <steve.reinhardt@amd.com> | 2010-09-16 20:24:05 -0700 |
|---|---|---|
| committer | Steve Reinhardt <steve.reinhardt@amd.com> | 2010-09-16 20:24:05 -0700 |
| commit | 3f9f4bf3d6ce9080adb03966599e0f1a98b091eb (patch) | |
| tree | 31c4b767f6d06cfcbfbd8ea6d8155b8efc6894b3 /src/dev/alpha | |
| parent | 2dd9f4fcf02c68eb86a6742576eecb3eef3b9ddf (diff) | |
| download | gem5-3f9f4bf3d6ce9080adb03966599e0f1a98b091eb.tar.xz | |
devices: undo cset 017baf09599f that added timer drain functions.
It's not the right fix for the checkpoint deadlock problem
Brad was having, and creates another bug where the system can
deadlock on restore. Brad can't reproduce the original bug
right now, so we'll wait until it arises again and then try
to fix it the right way then.
Diffstat (limited to 'src/dev/alpha')
| -rw-r--r-- | src/dev/alpha/tsunami_io.cc | 11 | ||||
| -rw-r--r-- | src/dev/alpha/tsunami_io.hh | 6 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/dev/alpha/tsunami_io.cc b/src/dev/alpha/tsunami_io.cc index 1a76c2c32..c90f06b5a 100644 --- a/src/dev/alpha/tsunami_io.cc +++ b/src/dev/alpha/tsunami_io.cc @@ -249,17 +249,6 @@ TsunamiIO::clearPIC(uint8_t bitvector) } } -unsigned int -TsunamiIO::drain(Event *de) -{ - unsigned int count = 0; - count += pitimer.drain(de); - count += rtc.drain(de); - assert(count == 0); - changeState(SimObject::Drained); - return count; -} - void TsunamiIO::serialize(ostream &os) { diff --git a/src/dev/alpha/tsunami_io.hh b/src/dev/alpha/tsunami_io.hh index f649247e2..b6d63322b 100644 --- a/src/dev/alpha/tsunami_io.hh +++ b/src/dev/alpha/tsunami_io.hh @@ -141,12 +141,6 @@ class TsunamiIO : public BasicPioDevice void clearPIC(uint8_t bitvector); /** - * Drain the io state including all associated events. - * @param drainEvent - */ - unsigned int drain(Event *de); - - /** * Serialize this object to the given output stream. * @param os The stream to serialize to. */ |