diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-07-07 19:02:12 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-07-07 19:02:12 -0400 |
| commit | cdf27a0a864b3c3a22fbcdd2afdd00edd00613a2 (patch) | |
| tree | 756298638faee2e6520d98ca4bbee3c4f7d0f25d /src/cpu/o3/commit_impl.hh | |
| parent | 8ade33d324218737c815935120307153975eeadc (diff) | |
| parent | e5aff1a7f326fb46c98bacbf4c9c42e0da94fe81 (diff) | |
| download | gem5-cdf27a0a864b3c3a22fbcdd2afdd00edd00613a2.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-o3
--HG--
extra : convert_revision : 9098d989832e2a5818b80771e3c02170c5c8cd5b
Diffstat (limited to 'src/cpu/o3/commit_impl.hh')
| -rw-r--r-- | src/cpu/o3/commit_impl.hh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh index 39e1cf3fe..cae773766 100644 --- a/src/cpu/o3/commit_impl.hh +++ b/src/cpu/o3/commit_impl.hh @@ -578,6 +578,9 @@ DefaultCommit<Impl>::tick() return; } + if ((*activeThreads).size() <= 0) + return; + list<unsigned>::iterator threads = (*activeThreads).begin(); // Check if any of the threads are done squashing. Change the @@ -591,7 +594,7 @@ DefaultCommit<Impl>::tick() commitStatus[tid] = Running; } else { DPRINTF(Commit,"[tid:%u]: Still Squashing, cannot commit any" - "insts this cycle.\n", tid); + " insts this cycle.\n", tid); rob->doSquash(tid); toIEW->commitInfo[tid].robSquashing = true; wroteToTimeBuffer = true; |