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

Merge branch 'chisel-v2' of github.com:ucb-bar/riscv-rocket into chisel-v2

Browse Source 
Conflicts:
	src/core.scala
	src/ctrl.scala
	src/dpath_util.scala
	src/fpu.scala
	src/nbdcache.scala
	src/tile.scala
This commit is contained in:
Henry Cook 2013-08-15 16:35:27 -07:00
commit ae02ebd153
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rocket/src/main/scala/core.scala
View File

@ -42,7 +42,7 @@ class Core(implicit conf: RocketConfiguration) extends Module
} else null
if (conf.vec) {
val vu = Module(new vu(Reg(next=reset)))
val vu = Module(new vu(Reg(next=this.reset)))
val vdtlb = Module(new TLB(8))
ptw += vdtlb.io.ptw

2
rocket/src/main/scala/dpath_util.scala
View File

@ -278,7 +278,7 @@ class PCR(implicit conf: RocketConfiguration) extends Module
io.host.ipi_rep.ready := Bool(true)
when (io.host.ipi_rep.valid) { r_irq_ipi := Bool(true) }
when(reset) {
when(this.reset) {
reg_status.et := false
reg_status.ef := false
reg_status.ev := false

2
rocket/src/main/scala/tile.scala
View File

@ -19,7 +19,7 @@ case class RocketConfiguration(tl: TileLinkConfiguration,
if (fastLoadByte) require(fastLoadWord)
}
class Tile(_reset: Bool = null)(confIn: RocketConfiguration) extends Module(_reset = _reset) with ClientCoherenceAgent
class Tile(resetSignal: Bool = null)(confIn: RocketConfiguration) extends Module(_reset = resetSignal) with ClientCoherenceAgent
{
val memPorts = 2 + confIn.vec
val dcachePortId = 0