1
0

Merge pull request #971 from freechipsproject/bump-chisel-firrtl

Bump chisel3 and firrtl, update plugin versions
This commit is contained in:
Jack Koenig 2017-09-29 17:24:12 -07:00 committed by GitHub
commit 723af5e6b6
6 changed files with 8 additions and 8 deletions

@ -1 +1 @@
Subproject commit bb12fe7f61d12f51cf5d56b2a66aca0a1234abb3
Subproject commit e2c5c128f6509805f71aeca790809b3e9a8fe84d

2
firrtl

@ -1 +1 @@
Subproject commit f8572ba6532359e8a0f1bc34f3eb8241a29129ab
Subproject commit 5e23294dc6ac3c1937c9f071f970178c9f724037

View File

@ -1 +1 @@
sbt.version=0.13.12
sbt.version=0.13.16

View File

@ -11,7 +11,7 @@ object BuildSettings extends Build {
override lazy val settings = super.settings ++ Seq(
organization := "berkeley",
version := "1.2",
scalaVersion := "2.11.7",
scalaVersion := "2.11.11",
parallelExecution in Global := false,
traceLevel := 15,
scalacOptions ++= Seq("-deprecation","-unchecked"),

View File

@ -1,13 +1,13 @@
resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.8.0")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")

View File

@ -150,7 +150,7 @@ class CaptureUpdateChain[+T <: Data, +V <: Data](genCapture: T, genUpdate: V) ex
io.chainOut.data := regs(0)
val updateBits = Cat(regs.reverse)(updateWidth-1, 0)
io.update.bits := io.update.bits.fromBits(updateBits)
io.update.bits := updateBits.asTypeOf(io.update.bits)
val captureBits = io.capture.bits.asUInt()