riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

JTAG: Revert to Chisel._ for Issue 1160 (#1161)

Browse Source 
* JTAG: Revert to Chisel._ for Issue 1160

* JTAG: Revert to Chisel._ for Issue 1160

* jtag: revert everything to Chisel._

* jtag: Revert all modules to Chisel._ vs chisel3, due to FIRRTL issues with chisel3 generated code
This commit is contained in:
Megan Wachs 2017-12-18 21:02:31 -08:00 committed by GitHub
parent a31ba2ea2e
commit 74d9326ebc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/jtag/JtagShifter.scala
View File

@ -2,10 +2,11 @@
package freechips.rocketchip.jtag package freechips.rocketchip.jtag
import chisel3._ //import chisel3._
import Chisel._
import chisel3.core.{Input, Output}
import chisel3.core.DataMirror import chisel3.core.DataMirror
import chisel3.internal.firrtl.KnownWidth import chisel3.internal.firrtl.KnownWidth
import chisel3.util._
import freechips.rocketchip.config.Parameters import freechips.rocketchip.config.Parameters
import freechips.rocketchip.util.property._ import freechips.rocketchip.util.property._

7
src/main/scala/jtag/JtagStateMachine.scala
View File

@ -2,8 +2,8 @@
package freechips.rocketchip.jtag package freechips.rocketchip.jtag
import chisel3._ import Chisel._
import chisel3.util._ import chisel3.{Input, Output}
import freechips.rocketchip.config.{Parameters} import freechips.rocketchip.config.{Parameters}
import freechips.rocketchip.util.{AsyncResetRegVec} import freechips.rocketchip.util.{AsyncResetRegVec}
import freechips.rocketchip.util.property._ import freechips.rocketchip.util.property._
@ -78,7 +78,8 @@ class JtagStateMachine(implicit val p: Parameters) extends Module(override_reset
} }
val io = IO(new StateMachineIO) val io = IO(new StateMachineIO)
val nextState = WireInit(JtagState.State.chiselType(), DontCare) // val nextState = WireInit(JtagState.State.chiselType(), DontCare)
val nextState = Wire(JtagState.State.chiselType())
val currStateReg = Module (new AsyncResetRegVec(w = JtagState.State.width, val currStateReg = Module (new AsyncResetRegVec(w = JtagState.State.width,
init = JtagState.State.toInt(JtagState.TestLogicReset))) init = JtagState.State.toInt(JtagState.TestLogicReset)))

15
src/main/scala/jtag/JtagTap.scala
View File

@ -4,7 +4,10 @@ package freechips.rocketchip.jtag
import scala.collection.SortedMap import scala.collection.SortedMap
import chisel3._ // !!! See Issue #1160.
// import chisel3._
import Chisel._
import chisel3.core.{Input, Output}
import chisel3.util._ import chisel3.util._
import freechips.rocketchip.config.Parameters import freechips.rocketchip.config.Parameters
@ -111,7 +114,8 @@ class JtagTapController(irLength: Int, initialInstruction: BigInt)(implicit val
nextActiveInstruction := irChain.io.update.bits nextActiveInstruction := irChain.io.update.bits
updateInstruction := true.B updateInstruction := true.B
} .otherwise { } .otherwise {
nextActiveInstruction := DontCare //!!! Needed when using chisel3._ (See #1160)
// nextActiveInstruction := DontCare
updateInstruction := false.B updateInstruction := false.B
} }
io.output.instruction := activeInstruction io.output.instruction := activeInstruction
@ -136,7 +140,8 @@ class JtagTapController(irLength: Int, initialInstruction: BigInt)(implicit val
tdo := irChain.io.chainOut.data tdo := irChain.io.chainOut.data
tdo_driven := true.B tdo_driven := true.B
} .otherwise { } .otherwise {
tdo := DontCare //!!! Needed when using chisel3._ (See #1160)
//tdo := DontCare
tdo_driven := false.B tdo_driven := false.B
} }
} }
@ -247,8 +252,8 @@ object JtagTapGenerator {
chainToSelect.map(mapInSelect) chainToSelect.map(mapInSelect)
controllerInternal.io.jtag <> internalIo.jtag controllerInternal.io.jtag <> internalIo.jtag
controllerInternal.io.control <> internalIo.control internalIo.control <> controllerInternal.io.control
controllerInternal.io.output <> internalIo.output internalIo.output <> controllerInternal.io.output
internalIo internalIo
} }

3
src/main/scala/jtag/JtagUtils.scala
View File

@ -2,7 +2,8 @@
package freechips.rocketchip.jtag package freechips.rocketchip.jtag
import chisel3._ import Chisel._
//import chisel3._
import chisel3.util._ import chisel3.util._
class JTAGIdcodeBundle extends Bundle { class JTAGIdcodeBundle extends Bundle {

5
src/main/scala/jtag/Utils.scala
View File

@ -2,8 +2,9 @@
package freechips.rocketchip.jtag package freechips.rocketchip.jtag
import chisel3._ //import chisel3._
import chisel3.util._ import Chisel._
import chisel3.core.{Input, Output}
/** Bundle representing a tristate pin. /** Bundle representing a tristate pin.
*/ */