From fb60b534b28e3f25828246b6066316af0c1dc6aa Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@linux.ibm.com>
Date: Mon, 3 Feb 2020 13:00:17 +1100
Subject: [PATCH] Temporary reset fix

We need to clean up the nia/fetch handling, but avoid the situation
where we come out of reset right around the time completed goes high.

Signed-off-by: Anton Blanchard <anton@linux.ibm.com>
---
 src/main/scala/Core.scala | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/Core.scala b/src/main/scala/Core.scala
index 5cdef81..5348d91 100644
--- a/src/main/scala/Core.scala
+++ b/src/main/scala/Core.scala
@@ -373,22 +373,22 @@ class Core(bits: Int, memSize: Int, memFileName: String, resetAddr: Int) extends
       cmp(wrData, adderLtOut, writebackIs32bit)
   }
 
-  val completed = RegNext(writebackFastValid || multiplier.io.out.valid || loadStore.io.out.valid || divider.io.out.valid)
-
-  val sFirst :: sSecond :: sThird :: Nil = Enum(3)
-  val initState = RegInit(sFirst)
+  val sReset :: sFirst :: sRunning :: Nil = Enum(3)
+  val initState = RegInit(sReset)
   switch (initState) {
-    is (sFirst) {
-      initState := sSecond
+    is (sReset) {
+      initState := sFirst
     }
 
-    is (sSecond) {
-      initState := sThird
+    is (sFirst) {
+      initState := sRunning
     }
   }
 
+  val completed = RegNext((initState === sRunning) && (writebackFastValid || multiplier.io.out.valid || loadStore.io.out.valid || divider.io.out.valid))
+
   // One instruction in the entire pipeline at a time
-  nia.io.nia.ready := completed || (initState === sSecond)
+  nia.io.nia.ready := completed || (initState === sFirst)
 }
 
 object CoreObj extends App {