1
0

Merge pull request #1019 from freechipsproject/move-rocket-int-sync

Move rocket output interrupt syncronizers
This commit is contained in:
Henry Cook 2017-09-27 14:46:02 -07:00 committed by GitHub
commit 5d08b37dab
2 changed files with 6 additions and 6 deletions

View File

@ -84,7 +84,11 @@ trait HasRocketTiles extends HasSystemBus
lip.foreach { coreIntXbar.intnode := _ } // lip lip.foreach { coreIntXbar.intnode := _ } // lip
wrapper.coreIntNode := coreIntXbar.intnode wrapper.coreIntNode := coreIntXbar.intnode
wrapper.intOutputNode.foreach { plic.intnode := _ } wrapper.intOutputNode.foreach { case int =>
val rocketIntXing = LazyModule(new IntXing(wrapper.outputInterruptXingLatency))
rocketIntXing.intnode := int
plic.intnode := rocketIntXing.intnode
}
wrapper wrapper
} }

View File

@ -213,11 +213,7 @@ abstract class RocketTileWrapper(rtp: RocketTileParams, hartid: Int)(implicit p:
def outputInterruptXingLatency: Int def outputInterruptXingLatency: Int
rocket.intOutputNode.foreach { rocketIntOutputNode => intOutputNode.foreach { _ := rocket.intOutputNode.get }
val outXing = LazyModule(new IntXing(outputInterruptXingLatency))
intOutputNode.get := outXing.intnode
outXing.intnode := rocketIntOutputNode
}
lazy val module = new LazyModuleImp(this) { lazy val module = new LazyModuleImp(this) {
val io = new CoreBundle val io = new CoreBundle