yystopf
/
riscv-lab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(csr): 增加tvec模式功能

This commit is contained in:
Liphen 2023-12-11 11:23:46 +08:00
parent 711e375959
commit de26a56cc2
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chisel/playground/src/pipeline/execute/Csr.scala
View File

@ -295,7 +295,8 @@ class Csr(implicit val config: CpuConfig) extends Module with HasCSRConst {
val exceptionNO = ExcPriority.foldRight(0.U)((i: Int, sum: UInt) => Mux(mem_ex.exception(i), i.U, sum)) val exceptionNO = ExcPriority.foldRight(0.U)((i: Int, sum: UInt) => Mux(mem_ex.exception(i), i.U, sum))
val interruptNO = IntPriority.foldRight(0.U)((i: Int, sum: UInt) => Mux(mem_ex.interrupt(i), i.U, sum)) val interruptNO = IntPriority.foldRight(0.U)((i: Int, sum: UInt) => Mux(mem_ex.interrupt(i), i.U, sum))
val causeNO = (has_interrupt << (XLEN - 1)) | Mux(has_interrupt, interruptNO, exceptionNO) val causeNO = Mux(has_interrupt, interruptNO, exceptionNO)
val cause = (has_interrupt << (XLEN - 1)) | causeNO
val has_instrPageFault = mem_ex.exception(instrPageFault) val has_instrPageFault = mem_ex.exception(instrPageFault)
val has_loadPageFault = mem_ex.exception(loadPageFault) val has_loadPageFault = mem_ex.exception(loadPageFault)
@ -326,7 +327,7 @@ class Csr(implicit val config: CpuConfig) extends Module with HasCSRConst {
when(has_exc_int) { when(has_exc_int) {
val mstatusOld = WireInit(mstatus.asTypeOf(new Mstatus)) val mstatusOld = WireInit(mstatus.asTypeOf(new Mstatus))
val mstatusNew = WireInit(mstatus.asTypeOf(new Mstatus)) val mstatusNew = WireInit(mstatus.asTypeOf(new Mstatus))
mcause := causeNO mcause := cause
mepc := SignedExtend(mem_pc, XLEN) mepc := SignedExtend(mem_pc, XLEN)
mstatusNew.mpp := mode mstatusNew.mpp := mode
mstatusNew.pie.m := mstatusOld.ie.m mstatusNew.pie.m := mstatusOld.ie.m
@ -339,7 +340,14 @@ class Csr(implicit val config: CpuConfig) extends Module with HasCSRConst {
val ret_target = Wire(UInt(VADDR_WID.W)) val ret_target = Wire(UInt(VADDR_WID.W))
ret_target := DontCare ret_target := DontCare
val trap_target = Wire(UInt(VADDR_WID.W)) val trap_target = Wire(UInt(VADDR_WID.W))
trap_target := mtvec(VADDR_WID - 1, 0) val tvec = mtvec
trap_target := tvec(VADDR_WID - 1, 0)
trap_target := (tvec(VADDR_WID - 1, 2) << 2) + Mux(
tvec(0) && has_interrupt,
(causeNO << 2),
0.U
)
when(isMret) { when(isMret) {
val mstatusOld = WireInit(mstatus.asTypeOf(new Mstatus)) val mstatusOld = WireInit(mstatus.asTypeOf(new Mstatus))