Connect FMA to Hwacha pipes

rocket/src/main/scala/core.scala

@@ -25,8 +25,6 @@ class Core(implicit conf: RocketConfiguration) extends Module
     val fpu = Module(new FPU(2,3))
     dpath.io.fpu <> fpu.io.dpath
     ctrl.io.fpu <> fpu.io.ctrl
-    fpu.io.sfma.valid := Bool(false) // hook these up to coprocessor?
-    fpu.io.dfma.valid := Bool(false)
     fpu
   } else null
 
@@ -43,4 +41,9 @@ class Core(implicit conf: RocketConfiguration) extends Module
 
   ctrl.io.rocc <> io.rocc
   dpath.io.rocc <> io.rocc
+
+  require(conf.fpu)
+  // Hookup the {S,D}FMA pipes
+  fpu.io.sfma <> io.rocc.cp_sfma
+  fpu.io.dfma <> io.rocc.cp_dfma
 }

rocket/src/main/scala/rocc.scala

@@ -42,6 +42,8 @@ class RoCCInterface(implicit conf: RocketConfiguration) extends Bundle
   val iptw = new TLBPTWIO
   val dptw = new TLBPTWIO
   val pptw = new TLBPTWIO
+  val cp_dfma = new ioFMA(65).flip
+  val cp_sfma = new ioFMA(33).flip
   val busy = Bool(OUTPUT)
   val interrupt = Bool(OUTPUT)