A few minor non-debug compilation issues.

--HG--
extra : convert_revision : d59a5cad6187a2229dddd1a48282ebd2923d1d8d

diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 9fb5cdbdebc01577dbafb19ffe5914de537063c3..c8c1a239c8be1ef9836ccf41d2ff10ba547dd210 100644 (file)
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -821,7 +821,9 @@ Cache<TagStore>::handleFill(PacketPtr pkt, BlkType *blk,
                             PacketList &writebacks)
 {
     Addr addr = pkt->getAddr();
+#if TRACING_ON
     CacheBlk::State old_state = blk ? blk->status : 0;
+#endif
 
     if (blk == NULL) {
         // better have read new data...

diff --git a/src/mem/cache/miss/mshr_queue.cc b/src/mem/cache/miss/mshr_queue.cc
index 56ec62a7d0852603b45ac366dc6b9654ce9bd6e2..4d3cf30e12b9284fab8b5bc0da01a57ae9e3aed0 100644 (file)
--- a/src/mem/cache/miss/mshr_queue.cc
+++ b/src/mem/cache/miss/mshr_queue.cc
@@ -123,6 +123,7 @@ MSHRQueue::addToReadyList(MSHR *mshr)
         }
     }
     assert(false);
+    return end;  // keep stupid compilers happy
 }
 
 

diff --git a/src/mem/cache/tags/split.cc b/src/mem/cache/tags/split.cc
index e22ccbb96223ea59a8f00d86d7c3d760f0a5691e..ae284766d39781b76ec71d44b0fa9fcc6a216fe6 100644 (file)
--- a/src/mem/cache/tags/split.cc
+++ b/src/mem/cache/tags/split.cc
@@ -300,7 +300,7 @@ Split::findBlock(Addr addr) const
 SplitBlk*
 Split::findReplacement(Addr addr, PacketList &writebacks)
 {
-    SplitBlk *blk;
+    SplitBlk *blk = NULL;
 
     assert(0);
 #if 0