Port: Make getAddrRanges const

[gem5.git] / src / mem / cache / mshr.cc

diff --git a/src/mem/cache/mshr.cc b/src/mem/cache/mshr.cc
index 54977346f51c7ec60dc7d0bacb3ced3f5abb698b..6fa22c9b47315838c0fbaa8c0b2da04110c09bd4 100644 (file)
--- a/src/mem/cache/mshr.cc
+++ b/src/mem/cache/mshr.cc
@@ -42,6 +42,7 @@
 
 #include "base/misc.hh"
 #include "base/types.hh"
+#include "debug/Cache.hh"
 #include "mem/cache/cache.hh"
 #include "mem/cache/mshr.hh"
 #include "sim/core.hh"
@@ -160,10 +161,18 @@ print(std::ostream &os, int verbosity, const std::string &prefix) const
     for (ConstIterator i = begin(); i != end_i; ++i) {
         const char *s;
         switch (i->source) {
-          case Target::FromCPU: s = "FromCPU";
-          case Target::FromSnoop: s = "FromSnoop";
-          case Target::FromPrefetcher: s = "FromPrefetcher";
-          default: s = "";
+          case Target::FromCPU:
+            s = "FromCPU";
+            break;
+          case Target::FromSnoop:
+            s = "FromSnoop";
+            break;
+          case Target::FromPrefetcher:
+            s = "FromPrefetcher";
+            break;
+          default:
+            s = "";
+            break;
         }
         ccprintf(os, "%s%s: ", prefix, s);
         i->pkt->print(os, verbosity, "");
@@ -330,10 +339,10 @@ MSHR::handleSnoop(PacketPtr pkt, Counter _order)
         //    to forward the snoop up the hierarchy after the current
         //    transaction completes.
         
-        // Actual target device (typ. PhysicalMemory) will delete the
+        // Actual target device (typ. a memory) will delete the
         // packet on reception, so we need to save a copy here.
         PacketPtr cp_pkt = new Packet(pkt, true);
-        targets->add(cp_pkt, curTick, _order, Target::FromSnoop,
+        targets->add(cp_pkt, curTick(), _order, Target::FromSnoop,
                      downstreamPending && targets->needsExclusive);
         ++ntargets;
 
@@ -378,7 +387,7 @@ MSHR::promoteDeferredTargets()
     deferredTargets->resetFlags();
 
     order = targets->front().order;
-    readyTime = std::max(curTick, targets->front().readyTime);
+    readyTime = std::max(curTick(), targets->front().readyTime);
 
     return true;
 }
@@ -451,4 +460,6 @@ MSHR::print(std::ostream &os, int verbosity, const std::string &prefix) const
 
 MSHR::~MSHR()
 {
+    delete[] targets;
+    delete[] deferredTargets;
 }