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

register_crossing: Remove the need for AsyncScope by specifying the master clock and reset. (#393)

Browse Source
This commit is contained in:
mwachs5 2016-10-09 15:51:23 -07:00 committed by GitHub
parent 1e69a2dc1c
commit b5d4b72313
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/scala/regmapper/RegisterCrossing.scala
View File

@ -4,7 +4,7 @@ package regmapper
import Chisel._ import Chisel._
import chisel3.util.{Irrevocable} import chisel3.util.{Irrevocable}
import util.{AsyncQueue,AsyncScope,AsyncResetRegVec} import util.{AsyncQueue,AsyncResetRegVec}
// A very simple flow control state machine, run in the specified clock domain // A very simple flow control state machine, run in the specified clock domain
class BusyRegisterCrossing(clock: Clock, reset: Bool) class BusyRegisterCrossing(clock: Clock, reset: Bool)
@ -143,7 +143,10 @@ class RegisterReadCrossing[T <: Data](gen: T, sync: Int = 3) extends Module {
object AsyncRWSlaveRegField { object AsyncRWSlaveRegField {
def apply(slave_clock: Clock, def apply(
master_clock: Clock,
master_reset: Bool,
slave_clock: Clock,
slave_reset: Bool, slave_reset: Bool,
width: Int, width: Int,
init: Int, init: Int,
@ -160,10 +163,8 @@ object AsyncRWSlaveRegField {
val wr_crossing = Module (new RegisterWriteCrossing(UInt(width = width))) val wr_crossing = Module (new RegisterWriteCrossing(UInt(width = width)))
name.foreach(n => wr_crossing.suggestName(s"${n}_wcrossing")) name.foreach(n => wr_crossing.suggestName(s"${n}_wcrossing"))
val scope = Module (new AsyncScope()) wr_crossing.io.master_clock := master_clock
wr_crossing.io.master_reset := master_reset
wr_crossing.io.master_clock := scope.clock
wr_crossing.io.master_reset := scope.reset
wr_crossing.io.master_allow := master_allow wr_crossing.io.master_allow := master_allow
wr_crossing.io.slave_clock := slave_clock wr_crossing.io.slave_clock := slave_clock
wr_crossing.io.slave_reset := slave_reset wr_crossing.io.slave_reset := slave_reset
@ -175,8 +176,8 @@ object AsyncRWSlaveRegField {
val rd_crossing = Module (new RegisterReadCrossing(UInt(width = width ))) val rd_crossing = Module (new RegisterReadCrossing(UInt(width = width )))
name.foreach(n => rd_crossing.suggestName(s"${n}_rcrossing")) name.foreach(n => rd_crossing.suggestName(s"${n}_rcrossing"))
rd_crossing.io.master_clock := scope.clock rd_crossing.io.master_clock := master_clock
rd_crossing.io.master_reset := scope.reset rd_crossing.io.master_reset := master_reset
rd_crossing.io.master_allow := master_allow rd_crossing.io.master_allow := master_allow
rd_crossing.io.slave_clock := slave_clock rd_crossing.io.slave_clock := slave_clock
rd_crossing.io.slave_reset := slave_reset rd_crossing.io.slave_reset := slave_reset