Hardware
/
VexRiscv
mirror of https://github.com/SpinalHDL/VexRiscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #399 from martijnbastiaan/wishbone-err 

Handle `ERR` in `toWishbone`
This commit is contained in:
Dolu1990 2024-03-29 12:40:17 +01:00 committed by GitHub
parent 6aeb6d4d43 5f58e0c7c6
commit 457ae5c7e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/vexriscv/ip/DataCache.scala
View File

@ -368,13 +368,13 @@ case class DataCacheMemBus(p : DataCacheConfig) extends Bundle with IMasterSlave
bus.WE := cmdBridge.wr
bus.DAT_MOSI := cmdBridge.data
cmdBridge.ready := cmdBridge.valid && bus.ACK
cmdBridge.ready := cmdBridge.valid && (bus.ACK || bus.ERR)
bus.CYC := cmdBridge.valid
bus.STB := cmdBridge.valid
rsp.valid := RegNext(cmdBridge.valid && !bus.WE && bus.ACK) init(False)
rsp.valid := RegNext(cmdBridge.valid && !bus.WE && (bus.ACK || bus.ERR)) init(False)
rsp.data := RegNext(bus.DAT_MISO)
rsp.error := False //TODO
rsp.error := RegNext(bus.ERR)
bus
}

8
src/main/scala/vexriscv/ip/InstructionCache.scala
View File

@ -239,15 +239,15 @@ case class InstructionCacheMemBus(p : InstructionCacheConfig) extends Bundle wit
when(cmd.valid || pending){
bus.CYC := True
bus.STB := True
when(bus.ACK){
when(bus.ACK || bus.ERR){
counter := counter + 1
}
}
cmd.ready := cmd.valid && bus.ACK
rsp.valid := RegNext(bus.CYC && bus.ACK) init(False)
cmd.ready := cmd.valid && (bus.ACK || bus.ERR)
rsp.valid := RegNext(bus.CYC && (bus.ACK || bus.ERR)) init(False)
rsp.data := RegNext(bus.DAT_MISO)
rsp.error := False //TODO
rsp.error := RegNext(bus.ERR)
bus
}

6
src/main/scala/vexriscv/plugin/DBusSimplePlugin.scala
View File

@ -199,13 +199,13 @@ case class DBusSimpleBus(bigEndian : Boolean = false) extends Bundle with IMaste
bus.WE := cmdStage.wr
bus.DAT_MOSI := cmdStage.data
cmdStage.ready := cmdStage.valid && bus.ACK
cmdStage.ready := cmdStage.valid && (bus.ACK || bus.ERR)
bus.CYC := cmdStage.valid
bus.STB := cmdStage.valid
rsp.ready := cmdStage.valid && !bus.WE && bus.ACK
rsp.ready := cmdStage.valid && !bus.WE && (bus.ACK || bus.ERR)
rsp.data := bus.DAT_MISO
rsp.error := False //TODO
rsp.error := bus.ERR
bus
}

6
src/main/scala/vexriscv/plugin/IBusSimplePlugin.scala
View File

@ -156,10 +156,10 @@ case class IBusSimpleBus(plugin: IBusSimplePlugin) extends Bundle with IMasterSl
bus.STB := cmdPipe.valid
cmdPipe.ready := cmdPipe.valid && bus.ACK
rsp.valid := bus.CYC && bus.ACK
cmdPipe.ready := cmdPipe.valid && (bus.ACK || bus.ERR)
rsp.valid := bus.CYC && (bus.ACK || bus.ERR)
rsp.inst := bus.DAT_MISO
rsp.error := False //TODO
rsp.error := bus.ERR
bus
}