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/kvm | |
| 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/kvm')
| -rw-r--r-- | src/cpu/kvm/base.cc | 6 | ||||
| -rw-r--r-- | src/cpu/kvm/base.hh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc index 2082670dc..ef9e8bb31 100644 --- a/src/cpu/kvm/base.cc +++ b/src/cpu/kvm/base.cc @@ -430,9 +430,9 @@ BaseKvmCPU::wakeup() } void -BaseKvmCPU::activateContext(ThreadID thread_num, Cycles delay) +BaseKvmCPU::activateContext(ThreadID thread_num) { - DPRINTF(Kvm, "ActivateContext %d (%d cycles)\n", thread_num, delay); + DPRINTF(Kvm, "ActivateContext %d\n", thread_num); assert(thread_num == 0); assert(thread); @@ -442,7 +442,7 @@ BaseKvmCPU::activateContext(ThreadID thread_num, Cycles delay) numCycles += ticksToCycles(thread->lastActivate - thread->lastSuspend); - schedule(tickEvent, clockEdge(delay)); + schedule(tickEvent, clockEdge(Cycles(0))); _status = Running; } diff --git a/src/cpu/kvm/base.hh b/src/cpu/kvm/base.hh index b987f6a3e..249398293 100644 --- a/src/cpu/kvm/base.hh +++ b/src/cpu/kvm/base.hh @@ -100,7 +100,7 @@ class BaseKvmCPU : public BaseCPU MasterPort &getInstPort() { return instPort; } void wakeup(); - void activateContext(ThreadID thread_num, Cycles delay); + void activateContext(ThreadID thread_num); void suspendContext(ThreadID thread_num); void deallocateContext(ThreadID thread_num); void haltContext(ThreadID thread_num); |