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

workaround Verilator comparaison linting

This commit is contained in:
Charles Papon 2019-04-06 02:00:47 +02:00
parent 21b4ae8f2f
commit 6df3e57843
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/vexriscv/plugin/CsrPlugin.scala
View File

@ -620,7 +620,7 @@ class CsrPlugin(config: CsrPluginConfig) extends Plugin[VexRiscv] with Exception
} }
} }
} }
val exceptionTargetPrivilege = exceptionTargetPrivilegeUncapped.max(privilege) val exceptionTargetPrivilege = privilege.max(exceptionTargetPrivilegeUncapped)
val groupedByStage = exceptionPortsInfos.map(_.stage).distinct.map(s => { val groupedByStage = exceptionPortsInfos.map(_.stage).distinct.map(s => {
val stagePortsInfos = exceptionPortsInfos.filter(_.stage == s).sortWith(_.priority > _.priority) val stagePortsInfos = exceptionPortsInfos.filter(_.stage == s).sortWith(_.priority > _.priority)
@ -681,12 +681,11 @@ class CsrPlugin(config: CsrPluginConfig) extends Plugin[VexRiscv] with Exception
//Process interrupt request, code and privilege //Process interrupt request, code and privilege
val interrupt = False val interrupt = False
val interruptCode = UInt(4 bits).assignDontCare().addTag(Verilator.public) val interruptCode = UInt(4 bits).assignDontCare().addTag(Verilator.public)
val privilegeAllowInterrupts = mutable.HashMap(
1 -> ((sstatus.SIE && privilege === "01") || privilege < "01"),
3 -> (mstatus.MIE || privilege < "11")
)
var interruptPrivilegs = if (supervisorGen) List(1, 3) else List(3) var interruptPrivilegs = if (supervisorGen) List(1, 3) else List(3)
val interruptTargetPrivilege = UInt(2 bits).assignDontCare() val interruptTargetPrivilege = UInt(2 bits).assignDontCare()
val privilegeAllowInterrupts = mutable.HashMap[Int, Bool]()
if(supervisorGen) privilegeAllowInterrupts += 1 -> ((sstatus.SIE && privilege === "01") || privilege < "01")
privilegeAllowInterrupts += 3 -> (mstatus.MIE || privilege < "11")
while(interruptPrivilegs.nonEmpty){ while(interruptPrivilegs.nonEmpty){
val p = interruptPrivilegs.head val p = interruptPrivilegs.head
when(privilegeAllowInterrupts(p)){ when(privilegeAllowInterrupts(p)){