Skip to content

Commit

Permalink
cpu: fix a switching issue with the o3 cpu.
Browse files Browse the repository at this point in the history
This change fixes the switcheroo test that broke earlier this month. The code
that was checking for the pipeline being blocked wasn't checking for a pending
translation, only for a icache access.
  • Loading branch information
Ali Saidi authored and Ali Saidi committed Apr 22, 2013
1 parent 5dd2383 commit c9e4678
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/cpu/o3/fetch_impl.hh
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,8 @@ DefaultFetch<Impl>::checkSignalsAndUpdate(ThreadID tid)
if (checkStall(tid) &&
fetchStatus[tid] != IcacheWaitResponse &&
fetchStatus[tid] != IcacheWaitRetry &&
fetchStatus[tid] != ItlbWait) {
fetchStatus[tid] != ItlbWait &&
fetchStatus[tid] != QuiescePending) {
DPRINTF(Fetch, "[tid:%i]: Setting to blocked\n",tid);

fetchStatus[tid] = Blocked;
Expand Down

0 comments on commit c9e4678

Please sign in to comment.