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

Merge pull request #1276 from freechipsproject/reg-desc-anno

Browse Source 
sbt: bump json4s-jackson to 3.5.3
This commit is contained in:
Henry Cook 2018-03-08 19:04:23 -08:00 committed by GitHub
commit 99862942fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -15,7 +15,7 @@ lazy val commonSettings = Seq(
traceLevel := 15, traceLevel := 15,
scalacOptions ++= Seq("-deprecation","-unchecked"), scalacOptions ++= Seq("-deprecation","-unchecked"),
libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value), libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value),
libraryDependencies ++= Seq("org.json4s" %% "json4s-jackson" % "3.5.0"), libraryDependencies ++= Seq("org.json4s" %% "json4s-jackson" % "3.5.3"),
addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full) addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
) )

2
src/main/scala/devices/debug/DebugTransport.scala
View File

@ -172,7 +172,7 @@ class DebugTransportModuleJTAG(debugAddrBits: Int, c: JtagDTMConfig)
// But there is actually no case in the current design where you SHOULD get an error, // But there is actually no case in the current design where you SHOULD get an error,
// as we haven't implemented Bus Masters or Serial Ports, which are the only cases errors // as we haven't implemented Bus Masters or Serial Ports, which are the only cases errors
// can occur. // can occur.
nonzeroResp := stickyNonzeroRespReg | (io.dmi.resp.valid & (io.dmi.resp.bits.resp != UInt(0))) nonzeroResp := stickyNonzeroRespReg | (io.dmi.resp.valid & (io.dmi.resp.bits.resp =/= UInt(0)))
assert(!nonzeroResp, "There is no reason to get a non zero response in the current system."); assert(!nonzeroResp, "There is no reason to get a non zero response in the current system.");
assert(!stickyNonzeroRespReg, "There is no reason to have a sticky non zero response in the current system."); assert(!stickyNonzeroRespReg, "There is no reason to have a sticky non zero response in the current system.");

2
src/main/scala/devices/tilelink/BusBypass.scala
View File

@ -103,7 +103,7 @@ class TLBusBypassBar(implicit p: Parameters) extends LazyModule
flight := next_flight flight := next_flight
when (next_flight === UInt(0)) { bypass := io.bypass } when (next_flight === UInt(0)) { bypass := io.bypass }
val stall = (bypass != io.bypass) && a_first val stall = (bypass =/= io.bypass) && a_first
out0.a.valid := !stall && in.a.valid && bypass out0.a.valid := !stall && in.a.valid && bypass
out1.a.valid := !stall && in.a.valid && !bypass out1.a.valid := !stall && in.a.valid && !bypass

9
src/main/scala/util/Misc.scala
View File

@ -4,7 +4,7 @@
package freechips.rocketchip.util package freechips.rocketchip.util
import Chisel._ import Chisel._
import chisel3.experimental.{dontTouch, RawModule} import chisel3.experimental.{ChiselAnnotation, RawModule}
import freechips.rocketchip.config.Parameters import freechips.rocketchip.config.Parameters
import scala.math._ import scala.math._
@ -14,6 +14,13 @@ class ParameterizedBundle(implicit p: Parameters) extends Bundle
trait DontTouch { trait DontTouch {
self: RawModule => self: RawModule =>
def dontTouch(data: Data): Unit = data match {
case agg: Aggregate =>
agg.getElements.foreach(dontTouch)
case elt: Element =>
annotate(ChiselAnnotation(elt, classOf[firrtl.Transform], "DONTtouch!"))
}
/** Marks every port as don't touch /** Marks every port as don't touch
* *
* @note This method can only be called after the Module has been fully constructed * @note This method can only be called after the Module has been fully constructed