Merge zizzer.eecs.umich.edu:/bk/newmem

into  zeep.eecs.umich.edu:/home/gblack/m5/newmem

--HG--
extra : convert_revision : 898976bbd322e55bc234035456df8090c6dcf72d

1 files changed, 16 insertions, 2 deletions

diff --git a/src/mem/tport.cc b/src/mem/tport.cc
index 456878d0a..21907c0ca 100644
--- a/src/mem/tport.cc
+++ b/src/mem/tport.cc
@@ -33,8 +33,22 @@
 void
 SimpleTimingPort::recvFunctional(Packet *pkt)
 {
-    // just do an atomic access and throw away the returned latency
-    recvAtomic(pkt);
+    //First check queued events
+    std::list<Packet *>::iterator i = transmitList.begin();
+    std::list<Packet *>::iterator end = transmitList.end();
+    bool cont = true;
+
+    while (i != end && cont) {
+        Packet * target = *i;
+        // If the target contains data, and it overlaps the
+        // probed request, need to update data
+        if (target->intersect(pkt))
+            fixPacket(pkt, target);
+
+    }
+    //Then just do an atomic access and throw away the returned latency
+    if (cont)
+        recvAtomic(pkt);
 }
 
 bool