Merge pull request #15 from antonblanchard/rework-slowops

Rework slowops

src/main/scala/SimpleDivider.scala

@@ -71,14 +71,15 @@ class SimpleDivider(val bits: Int) extends Module {
     overflow := quotient(63, 31).orR
   }
 
-  io.out.bits := quotient
+  val result = WireDefault(quotient)
   when (overflow) {
-    io.out.bits := 0.U
+    result := 0.U
   } .elsewhen (is32bit && !modulus) {
-    io.out.bits := 0.U(32.W) ## quotient(31, 0)
+    result := 0.U(32.W) ## quotient(31, 0)
   }
 
-  io.out.valid := (count === (bits+1).U) && busy
+  io.out.bits := RegNext(result)
+  io.out.valid := RegNext((count === (bits+1).U) && busy)
   when (io.out.valid) {
     busy := false.B
   }

src/main/scala/SimpleMultiplier.scala

@@ -1,5 +1,5 @@
 import chisel3._
-import chisel3.util.{Valid, Decoupled}
+import chisel3.util.{Valid, Decoupled, log2Ceil}
 
 import Helpers._
 
@@ -23,6 +23,7 @@ class SimpleMultiplier(val bits: Int) extends Module {
   val high = Reg(Bool())
   val res = Reg(UInt((2*bits).W))
   val busy = RegInit(false.B)
+  val count = Reg(UInt(log2Ceil(bits+1).W))
 
   io.in.ready := !busy
 
@@ -49,6 +50,7 @@ class SimpleMultiplier(val bits: Int) extends Module {
     high := io.in.bits.high
     res := 0.U
     busy := true.B
+    count := 0.U
   }
 
   when (busy) {
@@ -57,18 +59,20 @@ class SimpleMultiplier(val bits: Int) extends Module {
     }
     b := b << 1
     a := a >> 1
+    count := count + 1.U
   }
 
-  io.out.bits := res
+  val result = WireDefault(res)
   when (high) {
     when (is32bit) {
-      io.out.bits := res(63, 32) ## res(63, 32)
+      result := res(63, 32) ## res(63, 32)
     } .otherwise {
-      io.out.bits := res(127, 64)
+      result := res(127, 64)
     }
   }
 
-  io.out.valid := (a === 0.U) && busy
+  io.out.bits := RegNext(result)
+  io.out.valid := RegNext((count === (bits+1).U) && busy)
   when (io.out.valid) {
     busy := false.B
   }