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.
andysan · Mar 13, 2013 · 7de5726 · 7de5726
1 parent 303f7c4
commit 7de5726
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
@@ -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;
     }