github.com/antonblanchard.chiselwatt
1
0
Fork 0
mirror of https://github.com/antonblanchard/chiselwatt.git synced 2026-02-02 06:51:44 +00:00
Code Releases Activity

Merge pull request #9 from antonblanchard/reset-fix

Browse Source 
Temporary reset fix
This commit is contained in:
Anton Blanchard
2020-02-03 13:17:58 +11:00
committed by GitHub
parent 842c9cebd4 fb60b534b2
commit 7d5338dd5f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/scala/Core.scala
View File

@@ -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 {