diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-08-15 17:41:37 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-08-15 17:41:37 -0400 |
| commit | 4c3e01bd906a7be2b7c73515c8f0f00be1276a70 (patch) | |
| tree | 12c0e22066f09f6aafd2b768d1f16171351f27a9 /src/mem/cache | |
| parent | 890f0fc782b939a72c907ebf49866c634cfa3454 (diff) | |
| parent | ed58f77c473cf6f35a17ba1448a12dbca089987d (diff) | |
| download | gem5-4c3e01bd906a7be2b7c73515c8f0f00be1276a70.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/tmp/m5.newmem
--HG--
extra : convert_revision : d490a68eeabd0da7cd9791e14ca3678ed0fd31e6
Diffstat (limited to 'src/mem/cache')
| -rw-r--r-- | src/mem/cache/miss/mshr.cc | 4 | ||||
| -rw-r--r-- | src/mem/cache/miss/mshr_queue.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mem/cache/miss/mshr.cc b/src/mem/cache/miss/mshr.cc index 64bcbb833..519ec5ebd 100644 --- a/src/mem/cache/miss/mshr.cc +++ b/src/mem/cache/miss/mshr.cc @@ -102,8 +102,8 @@ MSHR::deallocate() assert(ntargets == 0); pkt = NULL; inService = false; - allocIter = NULL; - readyIter = NULL; + //allocIter = NULL; + //readyIter = NULL; } /* diff --git a/src/mem/cache/miss/mshr_queue.cc b/src/mem/cache/miss/mshr_queue.cc index f13f48dec..97a56119f 100644 --- a/src/mem/cache/miss/mshr_queue.cc +++ b/src/mem/cache/miss/mshr_queue.cc @@ -219,7 +219,7 @@ MSHRQueue::markInService(MSHR* mshr) } mshr->inService = true; pendingList.erase(mshr->readyIter); - mshr->readyIter = NULL; + //mshr->readyIter = NULL; inServiceMSHRs += 1; //pendingList.pop_front(); } @@ -227,7 +227,7 @@ MSHRQueue::markInService(MSHR* mshr) void MSHRQueue::markPending(MSHR* mshr, Packet::Command cmd) { - assert(mshr->readyIter == NULL); + //assert(mshr->readyIter == NULL); mshr->pkt->cmd = cmd; mshr->pkt->flags &= ~SATISFIED; mshr->inService = false; |