no manual changes

--HG--
extra : convert_revision : bfc34f3adaabcc8011bf9b22bd614ee8ebcbfd01

3 files changed, 12 insertions, 12 deletions

diff --git a/SConstruct b/SConstruct
index 30c1ed0a6..9394fa61b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -236,7 +236,7 @@ if False:
     env.TargetSignatures('content')
 
 # M5_PLY is used by isa_parser.py to find the PLY package.
-env.Append(ENV = { 'M5_PLY' : Dir('ext/ply') })
+env.Append(ENV = { 'M5_PLY' : str(Dir('ext/ply')) })
 env['GCC'] = False
 env['SUNCC'] = False
 env['ICC'] = False
diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index 6e790e438..02012ad4c 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -170,8 +170,6 @@ bool
 Bus::recvTiming(PacketPtr pkt)
 {
     short src = pkt->getSrc();
-    DPRINTF(Bus, "recvTiming: packet src %d dest %d addr 0x%x cmd %s\n",
-            src, pkt->getDest(), pkt->getAddr(), pkt->cmdString());
 
     BusPort *src_port;
     if (src == defaultId)
@@ -191,10 +189,14 @@ Bus::recvTiming(PacketPtr pkt)
          (retryList.size() && (!inRetry || src_port != retryList.front()))))
     {
         addToRetryList(src_port);
-        DPRINTF(Bus, "recvTiming: Bus is busy, returning false\n");
+        DPRINTF(Bus, "recvTiming: src %d dst %d %s 0x%x BUSY\n",
+                src, pkt->getDest(), pkt->cmdString(), pkt->getAddr());
         return false;
     }
 
+    DPRINTF(Bus, "recvTiming: src %d dst %d %s 0x%x\n",
+            src, pkt->getDest(), pkt->cmdString(), pkt->getAddr());
+
     if (!pkt->isExpressSnoop()) {
         occupyBus(pkt);
     }
@@ -243,7 +245,8 @@ Bus::recvTiming(PacketPtr pkt)
             // Packet not successfully sent. Leave or put it on the retry list.
             // illegal to block responses... can lead to deadlock
             assert(!pkt->isResponse());
-            DPRINTF(Bus, "Adding2 a retry to RETRY list %d\n", src);
+            DPRINTF(Bus, "recvTiming: src %d dst %d %s 0x%x TGT RETRY\n",
+                    src, pkt->getDest(), pkt->cmdString(), pkt->getAddr());
             addToRetryList(src_port);
             return false;
         }
diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 34084c8dc..92ff4d12e 100644
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -994,6 +994,10 @@ Cache<TagStore>::handleSnoop(PacketPtr pkt, BlkType *blk,
         blk->status &= ~bits_to_clear;
     }
 
+    DPRINTF(Cache, "snooped a %s request for addr %x, %snew state is %i\n",
+            pkt->cmdString(), blockAlign(pkt->getAddr()),
+            respond ? "responding, " : "", invalidate ? 0 : blk->status);
+
     if (respond) {
         assert(!pkt->memInhibitAsserted());
         pkt->assertMemInhibit();
@@ -1013,10 +1017,6 @@ Cache<TagStore>::handleSnoop(PacketPtr pkt, BlkType *blk,
     if (invalidate) {
         tags->invalidateBlk(blk);
     }
-
-    DPRINTF(Cache, "snooped a %s request for addr %x, %snew state is %i\n",
-            pkt->cmdString(), blockAlign(pkt->getAddr()),
-            respond ? "responding, " : "", blk->status);
 }
 
 
@@ -1384,9 +1384,6 @@ Cache<TagStore>::MemSidePort::sendPacket()
             MSHR *mshr = dynamic_cast<MSHR*>(pkt->senderState);
 
             bool success = sendTiming(pkt);
-            DPRINTF(CachePort,
-                    "Address %x was %s in sending the timing request\n",
-                    pkt->getAddr(), success ? "successful" : "unsuccessful");
 
             waitingOnRetry = !success;
             if (waitingOnRetry) {