diff options
| author | Steve Reinhardt <steve.reinhardt@amd.com> | 2011-09-22 18:59:55 -0700 |
|---|---|---|
| committer | Steve Reinhardt <steve.reinhardt@amd.com> | 2011-09-22 18:59:55 -0700 |
| commit | 84f0a1bd91b8af5517711fba00533daddb2359e1 (patch) | |
| tree | e9dd08fe7ff8a575efc08c5a927c719f674d06fe /src/cpu/o3 | |
| parent | ba79155d9d0f42457f74b533e27f0af2ab1b5e4a (diff) | |
| download | gem5-84f0a1bd91b8af5517711fba00533daddb2359e1.tar.xz | |
event: minor cleanup
Initialize flags via the Event constructor instead of calling
setFlags() in the body of the derived class's constructor. I
forget exactly why, but this made life easier when implementing
multi-queue support.
Also rename Event::getFlags() to isFlagSet() to better match
common usage, and get rid of some unused Event methods.
Diffstat (limited to 'src/cpu/o3')
| -rw-r--r-- | src/cpu/o3/commit_impl.hh | 3 | ||||
| -rw-r--r-- | src/cpu/o3/inst_queue_impl.hh | 5 | ||||
| -rw-r--r-- | src/cpu/o3/lsq_unit_impl.hh | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh index f218cc76a..75ae87c75 100644 --- a/src/cpu/o3/commit_impl.hh +++ b/src/cpu/o3/commit_impl.hh @@ -71,9 +71,8 @@ using namespace std; template <class Impl> DefaultCommit<Impl>::TrapEvent::TrapEvent(DefaultCommit<Impl> *_commit, ThreadID _tid) - : Event(CPU_Tick_Pri), commit(_commit), tid(_tid) + : Event(CPU_Tick_Pri, AutoDelete), commit(_commit), tid(_tid) { - this->setFlags(AutoDelete); } template <class Impl> diff --git a/src/cpu/o3/inst_queue_impl.hh b/src/cpu/o3/inst_queue_impl.hh index 9f1dc77b2..b2016cc9c 100644 --- a/src/cpu/o3/inst_queue_impl.hh +++ b/src/cpu/o3/inst_queue_impl.hh @@ -56,10 +56,9 @@ using namespace std; template <class Impl> InstructionQueue<Impl>::FUCompletion::FUCompletion(DynInstPtr &_inst, int fu_idx, InstructionQueue<Impl> *iq_ptr) - : Event(Stat_Event_Pri), inst(_inst), fuIdx(fu_idx), iqPtr(iq_ptr), - freeFU(false) + : Event(Stat_Event_Pri, AutoDelete), + inst(_inst), fuIdx(fu_idx), iqPtr(iq_ptr), freeFU(false) { - this->setFlags(Event::AutoDelete); } template <class Impl> diff --git a/src/cpu/o3/lsq_unit_impl.hh b/src/cpu/o3/lsq_unit_impl.hh index f934e2032..2a37d8b5c 100644 --- a/src/cpu/o3/lsq_unit_impl.hh +++ b/src/cpu/o3/lsq_unit_impl.hh @@ -60,9 +60,9 @@ template<class Impl> LSQUnit<Impl>::WritebackEvent::WritebackEvent(DynInstPtr &_inst, PacketPtr _pkt, LSQUnit *lsq_ptr) - : inst(_inst), pkt(_pkt), lsqPtr(lsq_ptr) + : Event(Default_Pri, AutoDelete), + inst(_inst), pkt(_pkt), lsqPtr(lsq_ptr) { - this->setFlags(Event::AutoDelete); } template<class Impl> |