diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-06-21 12:03:22 -0700 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-06-21 12:03:22 -0700 |
| commit | eff122797b5bc735c6d7c797be691c0fa02032e3 (patch) | |
| tree | 1dd1cef3b2b4e044fece9a406cd0ce97d09a2da7 /src/cpu/base.cc | |
| parent | 83af0fdcf57175adf8077c51e9ba872dd2c04b76 (diff) | |
| parent | 5195500cdf7dc99b5367f91387eef4e9f5b65bfe (diff) | |
| download | gem5-eff122797b5bc735c6d7c797be691c0fa02032e3.tar.xz | |
Merge vm1.(none):/home/stever/bk/newmem-head
into vm1.(none):/home/stever/bk/newmem-cache2
--HG--
extra : convert_revision : 9002940097a166c8442ae1adf41b974227968920
Diffstat (limited to 'src/cpu/base.cc')
| -rw-r--r-- | src/cpu/base.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/cpu/base.cc b/src/cpu/base.cc index 078ae1283..f86313da0 100644 --- a/src/cpu/base.cc +++ b/src/cpu/base.cc @@ -269,12 +269,10 @@ Tick BaseCPU::nextCycle(Tick begin_tick) { Tick next_tick = begin_tick; - next_tick -= (next_tick % clock); + if (next_tick % clock != 0) + next_tick = next_tick - (next_tick % clock) + clock; next_tick += phase; - while (next_tick < curTick) - next_tick += clock; - assert(next_tick >= curTick); return next_tick; } |