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

Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
Dolu1990 2018-12-30 15:53:25 +01:00
parent 92065a1a10 d617bafb08
commit 927ab6d127
1 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/main/scala/vexriscv/demo/VexRiscvAvalonForSim.scala
View File

@ -26,7 +26,7 @@ object VexRiscvAvalonForSim{
//CPU configuration //CPU configuration
val cpuConfig = VexRiscvConfig( val cpuConfig = VexRiscvConfig(
plugins = List( plugins = List(
new IBusSimplePlugin( /* new IBusSimplePlugin(
resetVector = 0x00000000l, resetVector = 0x00000000l,
cmdForkOnSecondStage = false, cmdForkOnSecondStage = false,
cmdForkPersistence = false, cmdForkPersistence = false,
@ -37,44 +37,44 @@ object VexRiscvAvalonForSim{
new DBusSimplePlugin( new DBusSimplePlugin(
catchAddressMisaligned = false, catchAddressMisaligned = false,
catchAccessFault = false catchAccessFault = false
), ),*/
// new IBusCachedPlugin( new IBusCachedPlugin(
// config = InstructionCacheConfig( config = InstructionCacheConfig(
// cacheSize = 4096, cacheSize = 4096,
// bytePerLine =32, bytePerLine =32,
// wayCount = 1, wayCount = 1,
// addressWidth = 32, addressWidth = 32,
// cpuDataWidth = 32, cpuDataWidth = 32,
// memDataWidth = 32, memDataWidth = 32,
// catchIllegalAccess = true, catchIllegalAccess = true,
// catchAccessFault = true, catchAccessFault = true,
// catchMemoryTranslationMiss = true, catchMemoryTranslationMiss = true,
// asyncTagMemory = false, asyncTagMemory = false,
// twoCycleRam = true twoCycleRam = true
)
// askMemoryTranslation = true,
// memoryTranslatorPortConfig = MemoryTranslatorPortConfig(
// portTlbSize = 4
// ) // )
// // askMemoryTranslation = true, ),
// // memoryTranslatorPortConfig = MemoryTranslatorPortConfig( new DBusCachedPlugin(
// // portTlbSize = 4 config = new DataCacheConfig(
// // ) cacheSize = 4096,
// ), bytePerLine = 32,
// new DBusCachedPlugin( wayCount = 1,
// config = new DataCacheConfig( addressWidth = 32,
// cacheSize = 4096, cpuDataWidth = 32,
// bytePerLine = 32, memDataWidth = 32,
// wayCount = 1, catchAccessError = true,
// addressWidth = 32, catchIllegal = true,
// cpuDataWidth = 32, catchUnaligned = true,
// memDataWidth = 32, catchMemoryTranslationMiss = true
// catchAccessError = true, ),
// catchIllegal = true, memoryTranslatorPortConfig = null
// catchUnaligned = true, // memoryTranslatorPortConfig = MemoryTranslatorPortConfig(
// catchMemoryTranslationMiss = true // portTlbSize = 6
// ), // )
// memoryTranslatorPortConfig = null ),
// // memoryTranslatorPortConfig = MemoryTranslatorPortConfig(
// // portTlbSize = 6
// // )
// ),
new StaticMemoryTranslatorPlugin( new StaticMemoryTranslatorPlugin(
ioRange = _(31 downto 28) === 0xF ioRange = _(31 downto 28) === 0xF
), ),
@ -165,7 +165,7 @@ object VexRiscvAvalonForSim{
.setName("dBusAvalon") .setName("dBusAvalon")
.addTag(ClockDomainTag(ClockDomain.current)) .addTag(ClockDomainTag(ClockDomain.current))
} }
case plugin: DebugPlugin => { case plugin: DebugPlugin => plugin.debugClockDomain {
plugin.io.bus.setAsDirectionLess() plugin.io.bus.setAsDirectionLess()
slave(plugin.io.bus.fromAvalon()) slave(plugin.io.bus.fromAvalon())
.setName("debugBusAvalon") .setName("debugBusAvalon")
@ -194,3 +194,4 @@ object VexRiscvAvalonForSim{
QSysify(report.toplevel) QSysify(report.toplevel)
} }
} }