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

fix(csr): 修改mip掩码

This commit is contained in:
Liphen 2024-03-01 12:55:44 +08:00
parent eea1f39ef3
commit 51189b0d38
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ class Csr(implicit val cpuConfig: CpuConfig) extends Module with HasCSRConst {
val mtval = RegInit(UInt(XLEN.W), 0.U) // 异常值寄存器 val mtval = RegInit(UInt(XLEN.W), 0.U) // 异常值寄存器
val mipWire = WireInit(0.U.asTypeOf(new Interrupt)) val mipWire = WireInit(0.U.asTypeOf(new Interrupt))
val mipReg = RegInit(UInt(XLEN.W), 0.U) val mipReg = RegInit(UInt(XLEN.W), 0.U)
val mipFixMask = "h77f".U(64.W) val mipFixMask = "hAAA".U(64.W)
val mip = mipWire.asUInt | mipReg // 中断挂起寄存器 val mip = mipWire.asUInt | mipReg // 中断挂起寄存器
// Machine Memory Protection // Machine Memory Protection
@ -204,7 +204,7 @@ class Csr(implicit val cpuConfig: CpuConfig) extends Module with HasCSRConst {
MaskedRegMap(Mhartid, mhartid, 0.U, MaskedRegMap.Unwritable), MaskedRegMap(Mhartid, mhartid, 0.U, MaskedRegMap.Unwritable),
// Machine Trap Setup // Machine Trap Setup
MaskedRegMap(Mstatus, mstatus, mstatus_wmask), MaskedRegMap(Mstatus, mstatus, mstatus_wmask),
MaskedRegMap(Misa, misa), // MXL，EXT目前不支持可变 MaskedRegMap(Misa, misa, 0.U, MaskedRegMap.Unwritable), // MXL，EXT目前不支持可变
MaskedRegMap(Medeleg, medeleg, "hbbff".U(XLEN.W)), MaskedRegMap(Medeleg, medeleg, "hbbff".U(XLEN.W)),
MaskedRegMap(Mideleg, mideleg, "h222".U(XLEN.W)), MaskedRegMap(Mideleg, mideleg, "h222".U(XLEN.W)),
MaskedRegMap(Mie, mie), MaskedRegMap(Mie, mie),
@ -269,7 +269,7 @@ class Csr(implicit val cpuConfig: CpuConfig) extends Module with HasCSRConst {
val raise_interrupt = mem_ex.interrupt.asUInt.orR val raise_interrupt = mem_ex.interrupt.asUInt.orR
val raise_exc_int = raise_exception || raise_interrupt val raise_exc_int = raise_exception || raise_interrupt
// 不带前缀的信号为exe阶段的信号 // 不带前缀的信号为exe阶段的信号
val valid = io.executeUnit.in.valid && !io.memoryUnit.out.flush // mem发生flush时，轻刷掉exe的信号 val valid = io.executeUnit.in.valid && !io.memoryUnit.out.flush // mem发生flush时，清刷掉exe的信号
val info = io.executeUnit.in.info val info = io.executeUnit.in.info
val op = io.executeUnit.in.info.op val op = io.executeUnit.in.info.op
val fusel = io.executeUnit.in.info.fusel val fusel = io.executeUnit.in.info.fusel