Merge pull request #66 from tomverbeure/IBusSimple_to_PipelinedMemoryBus

Add getPipelinedMemoryBusConfig()
This commit is contained in:
Dolu1990 2019-03-24 08:05:21 +01:00 committed by GitHub
commit d70f970b15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 4 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
*.class *.class
*.log *.log
*.bak *.bak
.*.swp
# sbt specific # sbt specific
.cache/ .cache/

View File

@ -63,6 +63,12 @@ object DBusSimpleBus{
useBTE = true, useBTE = true,
useCTI = true useCTI = true
) )
def getPipelinedMemoryBusConfig() = PipelinedMemoryBusConfig(
addressWidth = 32,
dataWidth = 32
)
} }
case class DBusSimpleBus() extends Bundle with IMasterSlave{ case class DBusSimpleBus() extends Bundle with IMasterSlave{
@ -178,7 +184,8 @@ case class DBusSimpleBus() extends Bundle with IMasterSlave{
} }
def toPipelinedMemoryBus() : PipelinedMemoryBus = { def toPipelinedMemoryBus() : PipelinedMemoryBus = {
val bus = PipelinedMemoryBus(32,32) val pipelinedMemoryBusConfig = DBusSimpleBus.getPipelinedMemoryBusConfig()
val bus = PipelinedMemoryBus(pipelinedMemoryBusConfig)
bus.cmd.valid := cmd.valid bus.cmd.valid := cmd.valid
bus.cmd.write := cmd.wr bus.cmd.write := cmd.wr
bus.cmd.address := cmd.address.resized bus.cmd.address := cmd.address.resized

View File

@ -59,6 +59,11 @@ object IBusSimpleBus{
useBTE = true, useBTE = true,
useCTI = true useCTI = true
) )
def getPipelinedMemoryBusConfig() = PipelinedMemoryBusConfig(
addressWidth = 32,
dataWidth = 32
)
} }
@ -136,7 +141,8 @@ case class IBusSimpleBus(interfaceKeepData : Boolean = false) extends Bundle wit
} }
def toPipelinedMemoryBus(): PipelinedMemoryBus = { def toPipelinedMemoryBus(): PipelinedMemoryBus = {
val bus = PipelinedMemoryBus(32,32) val pipelinedMemoryBusConfig = IBusSimpleBus.getPipelinedMemoryBusConfig()
val bus = PipelinedMemoryBus(pipelinedMemoryBusConfig)
bus.cmd.arbitrationFrom(cmd) bus.cmd.arbitrationFrom(cmd)
bus.cmd.address := cmd.pc.resized bus.cmd.address := cmd.pc.resized
bus.cmd.write := False bus.cmd.write := False