From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Thu, 23 Dec 2010 19:36:18 +0000 (-0600)
Subject: PerfectCacheMemory: Add return statements to two functions.
X-Git-Tag: stable_2012_02_02~690
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=04f5bb34ce0475a3fee8e3c104413f79668e0ab6;p=gem5.git

PerfectCacheMemory: Add return statements to two functions.
Two functions in src/mem/ruby/system/PerfectCacheMemory.hh, tryCacheAccess()
and cacheProbe(), end with calls to panic(). Both of these functions have
return type other than void. Any file that includes this header file fails
to compile because of the missing return statement. This patch adds dummy
values so as to avoid the compiler warnings.
---

diff --git a/src/mem/ruby/system/PerfectCacheMemory.hh b/src/mem/ruby/system/PerfectCacheMemory.hh
index 4b81cc790..b04a64717 100644
--- a/src/mem/ruby/system/PerfectCacheMemory.hh
+++ b/src/mem/ruby/system/PerfectCacheMemory.hh
@@ -124,6 +124,7 @@ PerfectCacheMemory<ENTRY>::tryCacheAccess(const CacheMsg& msg,
                                           bool& block_stc, ENTRY*& entry)
 {
     panic("not implemented");
+    return true;
 }
 
 // tests to see if an address is present in the cache
@@ -167,6 +168,7 @@ inline Address
 PerfectCacheMemory<ENTRY>::cacheProbe(const Address& newAddress) const
 {
     panic("cacheProbe called in perfect cache");
+    return newAddress;
 }
 
 // looks an address up in the cache