From cdc476a370dfbaf5aac7b50d9a4f55fd5c2d2692 Mon Sep 17 00:00:00 2001
From: Howard Mao <zhehao.mao@gmail.com>
Date: Tue, 1 Dec 2015 17:55:07 -0800
Subject: [PATCH] change Rocc parameterization

---
 rocket                       |  2 +-
 src/main/scala/Configs.scala | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/rocket b/rocket
index 7be550b4..9ac1e842 160000
--- a/rocket
+++ b/rocket
@@ -1 +1 @@
-Subproject commit 7be550b4f6cbf73514019712fd8505e7106e4f39
+Subproject commit 9ac1e842d9fb0a5048a92f3461c7c614b4793358
diff --git a/src/main/scala/Configs.scala b/src/main/scala/Configs.scala
index 4ffeac28..5cb29101 100644
--- a/src/main/scala/Configs.scala
+++ b/src/main/scala/Configs.scala
@@ -133,9 +133,7 @@ class DefaultConfig extends Config (
         }
       }
       case BuildRoCC => Nil
-      case RoccAcceleratorMemChannels => site(BuildRoCC).map(_ => 1)
-      case RoccOpcodes => site(BuildRoCC).map(_ => OpcodeSet.all)
-      case RoccNMemChannels => site(RoccAcceleratorMemChannels).fold(0)(_ + _)
+      case RoccNMemChannels => site(BuildRoCC).map(_.nMemChannels).foldLeft(0)(_ + _)
       //Rocket Core Constants
       case FetchWidth => 1
       case RetireWidth => 1
@@ -389,14 +387,17 @@ class FancyMemtestConfig extends Config(
 class WithRoccExample extends Config(
   (pname, site, here) => pname match {
     case BuildRoCC => Seq(
-      (p: Parameters) => Module(new AccumulatorExample()(p)),
-      (p: Parameters) => Module(new TranslatorExample()(p)),
-      (p: Parameters) => Module(new CharacterCountExample()(p)))
+      RoccParameters(
+        opcodes = OpcodeSet.custom0,
+        generator = (p: Parameters) => Module(new AccumulatorExample()(p))),
+      RoccParameters(
+        opcodes = OpcodeSet.custom1,
+        generator = (p: Parameters) => Module(new TranslatorExample()(p))),
+      RoccParameters(
+        opcodes = OpcodeSet.custom2,
+        generator = (p: Parameters) => Module(new CharacterCountExample()(p))))
+
     case RoccMaxTaggedMemXacts => 1
-    case RoccOpcodes => Seq(
-      OpcodeSet.custom0,
-      OpcodeSet.custom1,
-      OpcodeSet.custom2)
   })
 
 class RoccExampleConfig extends Config(new WithRoccExample ++ new DefaultConfig)