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

fix(csr): 修复mem级valid无效时仍使用ex信息

This commit is contained in:
Liphen 2024-03-11 19:27:23 +08:00
parent 68dd1be7ac
commit aaf97820d4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chisel/playground/src/pipeline/execute/fu/Csr.scala
View File

@ -265,8 +265,8 @@ class Csr(implicit val cpuConfig: CpuConfig) extends Module with HasCSRConst {
val mem_valid = mem_inst_info.valid
val mem_addr = mem_inst(31, 20)
val raise_exception = mem_ex.exception.asUInt.orR
val raise_interrupt = mem_ex.interrupt.asUInt.orR
val raise_exception = mem_ex.exception.asUInt.orR && mem_valid
val raise_interrupt = mem_ex.interrupt.asUInt.orR && mem_valid
val raise_exc_int = raise_exception || raise_interrupt
// 不带前缀的信号为exe阶段的信号
val valid = io.executeUnit.in.valid && !io.memoryUnit.out.flush // mem发生flush时，清刷掉exe的信号