Permalink
Browse files

cpu: Set memReq[tid] to NULL in finishTranslation after squashes

DefaultFetch::finishTranslation() sometimes deleted the incomming
memory request without clearing the associated memReq pointer. This
caused an assertion in DefaultFetch::drainSanityCheck to fail.
  • Loading branch information...
1 parent 303f7c4 commit 7de57260fb00a75984a3a951a51721c0d0167219 @andysan committed Feb 4, 2013
Showing with 2 additions and 0 deletions.
  1. +2 −0 src/cpu/o3/fetch_impl.hh
View
@@ -624,6 +624,8 @@ DefaultFetch<Impl>::finishTranslation(Fault fault, RequestPtr mem_req)
tid);
++fetchTlbSquashes;
delete mem_req;
+ if (mem_req != memReq[tid])
+ memReq[tid] = NULL;
return;
}

0 comments on commit 7de5726

Please sign in to comment.