diff options
Diffstat (limited to 'src/mem')
| -rw-r--r-- | src/mem/cache/miss/mshr.cc | 4 | ||||
| -rw-r--r-- | src/mem/cache/miss/mshr_queue.cc | 4 | ||||
| -rw-r--r-- | src/mem/packet.hh | 1 | ||||
| -rw-r--r-- | src/mem/request.hh | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/mem/cache/miss/mshr.cc b/src/mem/cache/miss/mshr.cc index db2f40c56..d073c0fea 100644 --- a/src/mem/cache/miss/mshr.cc +++ b/src/mem/cache/miss/mshr.cc @@ -103,8 +103,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 6516a99f8..ffb486c64 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; diff --git a/src/mem/packet.hh b/src/mem/packet.hh index 83b4006e2..9e961b0dc 100644 --- a/src/mem/packet.hh +++ b/src/mem/packet.hh @@ -42,6 +42,7 @@ #include "sim/host.hh" #include "sim/root.hh" #include <list> +#include <cassert> struct Packet; typedef Packet* PacketPtr; diff --git a/src/mem/request.hh b/src/mem/request.hh index 457310298..6acd7526c 100644 --- a/src/mem/request.hh +++ b/src/mem/request.hh @@ -42,6 +42,8 @@ #include "sim/host.hh" #include "sim/root.hh" +#include <cassert> + class Request; typedef Request* RequestPtr; |