From 5f22e91a7fc828f7b2e552a7b6aebe2bfc0ec822 Mon Sep 17 00:00:00 2001
From: Henry Cook <henry@sifive.com>
Date: Tue, 16 May 2017 16:44:53 -0700
Subject: [PATCH] rocc: fix RoccExampleConfig

---
 src/main/scala/coreplex/Configs.scala | 26 ++++++++++++++------------
 src/main/scala/tile/LegacyRoCC.scala  |  4 ++--
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/scala/coreplex/Configs.scala b/src/main/scala/coreplex/Configs.scala
index 3a72cb94..7f4f0f16 100644
--- a/src/main/scala/coreplex/Configs.scala
+++ b/src/main/scala/coreplex/Configs.scala
@@ -163,18 +163,20 @@ class WithNBreakpoints(hwbp: Int) extends Config ((site, here, up) => {
 })
 
 class WithRoccExample extends Config((site, here, up) => {
-  case BuildRoCC => Seq(
-    RoCCParams(
-      opcodes = OpcodeSet.custom0,
-      generator = (p: Parameters) => Module(new AccumulatorExample()(p))),
-    RoCCParams(
-      opcodes = OpcodeSet.custom1,
-      generator = (p: Parameters) => Module(new TranslatorExample()(p)),
-      nPTWPorts = 1),
-    RoCCParams(
-      opcodes = OpcodeSet.custom2,
-      generator = (p: Parameters) => Module(new CharacterCountExample()(p))))
-
+  case RocketTilesKey => up(RocketTilesKey, site) map { r =>
+    r.copy(rocc = Seq(
+      RoCCParams(
+        opcodes = OpcodeSet.custom0,
+        generator = (p: Parameters) => Module(new AccumulatorExample()(p))),
+      RoCCParams(
+         opcodes = OpcodeSet.custom1,
+         generator = (p: Parameters) => Module(new TranslatorExample()(p)),
+         nPTWPorts = 1),
+      RoCCParams(
+         opcodes = OpcodeSet.custom2,
+         generator = (p: Parameters) => Module(new CharacterCountExample()(p)))
+    ))
+  }
   case RoccMaxTaggedMemXacts => 1
 })
 
diff --git a/src/main/scala/tile/LegacyRoCC.scala b/src/main/scala/tile/LegacyRoCC.scala
index 7d052021..52b99082 100644
--- a/src/main/scala/tile/LegacyRoCC.scala
+++ b/src/main/scala/tile/LegacyRoCC.scala
@@ -48,7 +48,7 @@ trait CanHaveLegacyRoccs extends CanHaveSharedFPU with CanHavePTW with HasTileLi
     }})))
 
   legacyRocc foreach { lr =>
-    tileBus.node := lr.masterNode
+    tileBus.node :=* lr.masterNode
     nPTWPorts += lr.nPTWPorts
     nDCachePorts += lr.nRocc
   }
@@ -66,7 +66,7 @@ trait CanHaveLegacyRoccsModule extends CanHaveSharedFPUModule
       None
     } foreach { lr =>
       fpu.io.cp_req <> lr.module.io.fpu.cp_req
-      fpu.io.cp_resp <> lr.module.io.fpu.cp_resp
+      lr.module.io.fpu.cp_resp <> fpu.io.cp_resp
     }
   }