From 3f47d5b5ebc7ac80f92b7dd33b633065606a0d0b Mon Sep 17 00:00:00 2001
From: Henry Cook <henry@sifive.com>
Date: Sat, 19 Nov 2016 19:19:16 -0800
Subject: [PATCH] [rocket] re-enable working NBDcache (passes Tracegen)

---
 src/main/scala/rocket/{dcache.scala => Dcache.scala}     | 0
 src/main/scala/rocket/HellaCache.scala                   | 5 ++---
 src/main/scala/rocket/{nbdcache.scala => NBDcache.scala} | 0
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename src/main/scala/rocket/{dcache.scala => Dcache.scala} (100%)
 rename src/main/scala/rocket/{nbdcache.scala => NBDcache.scala} (100%)

diff --git a/src/main/scala/rocket/dcache.scala b/src/main/scala/rocket/Dcache.scala
similarity index 100%
rename from src/main/scala/rocket/dcache.scala
rename to src/main/scala/rocket/Dcache.scala
diff --git a/src/main/scala/rocket/HellaCache.scala b/src/main/scala/rocket/HellaCache.scala
index 6d172941..eb1a91f9 100644
--- a/src/main/scala/rocket/HellaCache.scala
+++ b/src/main/scala/rocket/HellaCache.scala
@@ -161,8 +161,7 @@ class HellaCacheModule(outer: HellaCache)(implicit val p: Parameters) extends La
 
 object HellaCache {
   def apply(cfg: DCacheConfig)(implicit p: Parameters) = {
-    //if (cfg.nMSHRs == 0) LazyModule(new DCache(cfg))
-    //else LazyModule(new NonBlockingDCache(cfg))
-    LazyModule(new DCache(cfg))
+    if (cfg.nMSHRs == 0) LazyModule(new DCache(cfg))
+    else LazyModule(new NonBlockingDCache(cfg))
   }
 }
diff --git a/src/main/scala/rocket/nbdcache.scala b/src/main/scala/rocket/NBDcache.scala
similarity index 100%
rename from src/main/scala/rocket/nbdcache.scala
rename to src/main/scala/rocket/NBDcache.scala