Small changes:

?? doesn't compile in warn statements
Should have been false, where I had a true.

src/cpu/o3/lsq_impl.hh:
    Apparently you can't have ?? in a warn statement (Something about trigraphs)
src/mem/cache/cache_impl.hh:
    Forgot to signal atomic mode in snoopProbe

--HG--
extra : convert_revision : c75cb76e193e852284564993440c8ea39e6de426

diff --git a/src/cpu/o3/lsq_impl.hh b/src/cpu/o3/lsq_impl.hh
index 337ee037230920ac595347405ac07570e9b5b823..317e23b140d8610d59cacb44aac03c3cdc8bda00 100644 (file)
--- a/src/cpu/o3/lsq_impl.hh
+++ b/src/cpu/o3/lsq_impl.hh
@@ -68,7 +68,7 @@ LSQ<Impl>::DcachePort::recvTiming(PacketPtr pkt)
     }
     else {
     //else it is a coherence request, maybe you need to do something
-        warn("Recieved a coherence request (Invalidate??), 03CPU doesn't"
+        warn("Recieved a coherence request (Invalidate?), 03CPU doesn't"
              "update LSQ for these\n");
     }
     return true;

diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 18f56b1ba98eaac37ab784101d52c414f19536fe..c4acc03e7b34f34f29366d4340b2dbc0fba3e16f 100644 (file)
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -720,7 +720,7 @@ Tick
 Cache<TagStore,Buffering,Coherence>::snoopProbe(PacketPtr &pkt)
 {
     //Send a atomic (false) invalidate up if the protocol calls for it
-    coherence->propogateInvalidate(pkt, true);
+    coherence->propogateInvalidate(pkt, false);
 
     Addr blk_addr = pkt->getAddr() & ~(Addr(blkSize-1));
     BlkType *blk = tags->findBlock(pkt);