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

Use BundleWithConf to avoid clone method boilerplate

Browse Source
This commit is contained in:
Andrew Waterman
2014-05-09 19:30:05 -07:00
parent 94c1f01ec6
commit 4ca152b012
9 changed files with 29 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rocket/src/main/scala/btb.scala
View File

@ -53,7 +53,7 @@ class BHT(implicit conf: BTBConfig) {
val history = Reg(UInt(width = log2Up(conf.nbht)))
}
class BTBUpdate(implicit conf: BTBConfig) extends Bundle {
class BTBUpdate(implicit val conf: BTBConfig) extends BundleWithConf {
val prediction = Valid(new BTBResp)
val pc = UInt(width = conf.as.vaddrBits)
val target = UInt(width = conf.as.vaddrBits)
@ -63,17 +63,13 @@ class BTBUpdate(implicit conf: BTBConfig) extends Bundle {
val isCall = Bool()
val isReturn = Bool()
val incorrectTarget = Bool()
override def clone = new BTBUpdate().asInstanceOf[this.type]
}
class BTBResp(implicit conf: BTBConfig) extends Bundle {
class BTBResp(implicit val conf: BTBConfig) extends BundleWithConf {
val taken = Bool()
val target = UInt(width = conf.as.vaddrBits)
val entry = UInt(width = conf.opaqueBits)
val bht = new BHTResp
override def clone = new BTBResp().asInstanceOf[this.type]
}
// fully-associative branch target buffer