diff options
| author | Mitch Hayenga <mitch.hayenga@arm.com> | 2014-09-20 17:18:35 -0400 |
|---|---|---|
| committer | Mitch Hayenga <mitch.hayenga@arm.com> | 2014-09-20 17:18:35 -0400 |
| commit | e1403fc2af61c224c573c47c77a36f9b1b78e7df (patch) | |
| tree | 07647bb8697ac256d180bf8de35080eee2a63f3e /src/cpu/o3/thread_context_impl.hh | |
| parent | 2b0438a11eb6a9640b06da91e8a300d0ac3ad81a (diff) | |
| download | gem5-e1403fc2af61c224c573c47c77a36f9b1b78e7df.tar.xz | |
alpha,arm,mips,power,x86,cpu,sim: Cleanup activate/deactivate
activate(), suspend(), and halt() used on thread contexts had an optional
delay parameter. However this parameter was often ignored. Also, when used,
the delay was seemily arbitrarily set to 0 or 1 cycle (no other delays were
ever specified). This patch removes the delay parameter and 'Events'
associated with them across all ISAs and cores. Unused activate logic
is also removed.
Diffstat (limited to 'src/cpu/o3/thread_context_impl.hh')
| -rwxr-xr-x | src/cpu/o3/thread_context_impl.hh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/cpu/o3/thread_context_impl.hh b/src/cpu/o3/thread_context_impl.hh index 43e903135..e6a3d5083 100755 --- a/src/cpu/o3/thread_context_impl.hh +++ b/src/cpu/o3/thread_context_impl.hh @@ -84,7 +84,7 @@ O3ThreadContext<Impl>::takeOverFrom(ThreadContext *old_context) template <class Impl> void -O3ThreadContext<Impl>::activate(Cycles delay) +O3ThreadContext<Impl>::activate() { DPRINTF(O3CPU, "Calling activate on Thread Context %d\n", threadId()); @@ -96,12 +96,12 @@ O3ThreadContext<Impl>::activate(Cycles delay) thread->setStatus(ThreadContext::Active); // status() == Suspended - cpu->activateContext(thread->threadId(), delay); + cpu->activateContext(thread->threadId()); } template <class Impl> void -O3ThreadContext<Impl>::suspend(Cycles delay) +O3ThreadContext<Impl>::suspend() { DPRINTF(O3CPU, "Calling suspend on Thread Context %d\n", threadId()); @@ -118,10 +118,9 @@ O3ThreadContext<Impl>::suspend(Cycles delay) template <class Impl> void -O3ThreadContext<Impl>::halt(Cycles delay) +O3ThreadContext<Impl>::halt() { - DPRINTF(O3CPU, "Calling halt on Thread Context %d\n", - threadId()); + DPRINTF(O3CPU, "Calling halt on Thread Context %d\n", threadId()); if (thread->status() == ThreadContext::Halted) return; |