Port: Make getAddrRanges const

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

diff --git a/src/mem/cache/builder.cc b/src/mem/cache/builder.cc
index 599353b8854e1f1d104d4268f6bf1191adc1d4b9..ca8c378fb9ef9688d4a47848338049bbb8bcd986 100644 (file)
--- a/src/mem/cache/builder.cc
+++ b/src/mem/cache/builder.cc
@@ -33,14 +33,13 @@
  * @file
  * Simobject instatiation of caches.
  */
+#include <list>
 #include <vector>
 
-// Must be included first to determine which caches we want
-#include "enums/Prefetch.hh"
-#include "mem/config/cache.hh"
+#include "config/the_isa.hh"
 #include "mem/cache/base.hh"
 #include "mem/cache/cache.hh"
-#include "mem/bus.hh"
+#include "mem/config/cache.hh"
 #include "params/BaseCache.hh"
 
 // Tag Templates
@@ -56,32 +55,13 @@
 #include "mem/cache/tags/iic.hh"
 #endif
 
-//Prefetcher Headers
-#include "mem/cache/prefetch/ghb.hh"
-#include "mem/cache/prefetch/tagged.hh"
-#include "mem/cache/prefetch/stride.hh"
-
 
 using namespace std;
-using namespace TheISA;
 
 #define BUILD_CACHE(TAGS, tags)                         \
     do {                                                \
-        BasePrefetcher *pf;                             \
-        if (prefetch_policy == Enums::tagged) {         \
-            pf = new TaggedPrefetcher(this);            \
-        }                                               \
-        else if (prefetch_policy == Enums::stride) {    \
-            pf = new StridePrefetcher(this);            \
-        }                                               \
-        else if (prefetch_policy == Enums::ghb) {       \
-            pf = new GHBPrefetcher(this);               \
-        }                                               \
-        else {                                          \
-            pf = NULL;                                  \
-        }                                               \
         Cache<TAGS> *retval =                           \
-            new Cache<TAGS>(this, tags, pf);            \
+            new Cache<TAGS>(this, tags);            \
         return retval;                                  \
     } while (0)