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

util: add Option.unzip

Browse Source
This commit is contained in:
Wesley W. Terpstra 2017-09-25 11:25:46 -07:00
parent 60614055e3
commit 5323cf88dd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/rocket/ICache.scala
View File

@ -109,8 +109,7 @@ class ICacheModule(outer: ICache) extends LazyModuleImp(outer)
val io = IO(new ICacheBundle(outer)) val io = IO(new ICacheBundle(outer))
val (tl_out, edge_out) = outer.masterNode.out(0) val (tl_out, edge_out) = outer.masterNode.out(0)
// Option.unzip does not exist :-( // Option.unzip does not exist :-(
val tl_in = outer.slaveNode.in.headOption.map(_._1) val (tl_in, edge_in) = outer.slaveNode.in.headOption.unzip
val edge_in = outer.slaveNode.in.headOption.map(_._2)
val tECC = cacheParams.tagECC val tECC = cacheParams.tagECC
val dECC = cacheParams.dataECC val dECC = cacheParams.dataECC

4
src/main/scala/util/package.scala
View File

@ -6,6 +6,10 @@ import Chisel._
import scala.math.min import scala.math.min
package object util { package object util {
implicit class UnzippableOption[S, T](val x: Option[(S, T)]) {
def unzip = (x.map(_._1), x.map(_._2))
}
implicit class UIntIsOneOf(val x: UInt) extends AnyVal { implicit class UIntIsOneOf(val x: UInt) extends AnyVal {
def isOneOf(s: Seq[UInt]): Bool = s.map(x === _).reduce(_||_) def isOneOf(s: Seq[UInt]): Bool = s.map(x === _).reduce(_||_)