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

fix(csr): ret信号错误

This commit is contained in:
Liphen 2023-11-29 16:46:25 +08:00
parent a4247ae490
commit b170d374ee
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,6 +209,7 @@ class Csr(implicit val config: CpuConfig) extends Module with HasCSRConst {
val mem_inst = mem_inst_info.inst val mem_inst = mem_inst_info.inst
val mem_valid = mem_inst_info.valid val mem_valid = mem_inst_info.valid
val mem_addr = mem_inst(31, 20) val mem_addr = mem_inst(31, 20)
// 不带前缀的信号为exe阶段的信号
val valid = io.executeUnit.in.valid val valid = io.executeUnit.in.valid
val op = io.executeUnit.in.inst_info.op val op = io.executeUnit.in.inst_info.op
val fusel = io.executeUnit.in.inst_info.fusel val fusel = io.executeUnit.in.inst_info.fusel
@ -248,10 +249,13 @@ class Csr(implicit val config: CpuConfig) extends Module with HasCSRConst {
MaskedRegMap.generate(fixMapping, addr, rdataDummy, wen && !illegal_access, wdata) MaskedRegMap.generate(fixMapping, addr, rdataDummy, wen && !illegal_access, wdata)
// CSR inst decode // CSR inst decode
val ret = Wire(Bool()) val ret = Wire(Bool())
val isMret = mem_addr === privMret && op === CSROpType.jmp && mem_inst_info.fusel === FuType.csr && mem_valid val isMret =
val isSret = mem_addr === privSret && op === CSROpType.jmp && mem_inst_info.fusel === FuType.csr && mem_valid mem_addr === privMret && mem_inst_info.op === CSROpType.jmp && mem_inst_info.fusel === FuType.csr && mem_valid
val isUret = mem_addr === privUret && op === CSROpType.jmp && mem_inst_info.fusel === FuType.csr && mem_valid val isSret =
mem_addr === privSret && mem_inst_info.op === CSROpType.jmp && mem_inst_info.fusel === FuType.csr && mem_valid
val isUret =
mem_addr === privUret && mem_inst_info.op === CSROpType.jmp && mem_inst_info.fusel === FuType.csr && mem_valid
ret := isMret || isSret || isUret ret := isMret || isSret || isUret
val has_exception = mem_ex.exception.asUInt.orR val has_exception = mem_ex.exception.asUInt.orR