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

fix(idu): 增加tval来源

This commit is contained in:
Liphen 2024-01-17 16:10:00 +08:00
parent 2ee4b18581
commit df72450747
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
chisel/playground/src/pipeline/decode/DecodeUnit.scala
View File

@ -134,11 +134,14 @@ class DecodeUnit(implicit val cpuConfig: CpuConfig) extends Module with HasExcep
info(0).op === CSROpType.jmp && mode === ModeS && info(0).fusel === FuType.csr info(0).op === CSROpType.jmp && mode === ModeS && info(0).fusel === FuType.csr
io.executeStage.inst0.ex.exception(ecallU) := info(0).inst(31, 20) === privEcall && io.executeStage.inst0.ex.exception(ecallU) := info(0).inst(31, 20) === privEcall &&
info(0).op === CSROpType.jmp && mode === ModeU && info(0).fusel === FuType.csr info(0).op === CSROpType.jmp && mode === ModeU && info(0).fusel === FuType.csr
// tval注意先后顺序
io.executeStage.inst0.ex.tval := MuxCase( io.executeStage.inst0.ex.tval := MuxCase(
0.U, 0.U,
Seq( Seq(
pc(0)(log2Ceil(INST_WID / 8) - 1, 0).orR -> pc(0), io.executeStage.inst0.ex.exception(instrPageFault) -> pc(0),
io.executeStage.inst0.ex.exception(instrAccessFault) -> pc(0),
!info(0).inst_legal -> info(0).inst, !info(0).inst_legal -> info(0).inst,
pc(0)(log2Ceil(INST_WID / 8) - 1, 0).orR -> pc(0),
(io.fetchUnit.target(log2Ceil(INST_WID / 8) - 1, 0).orR && io.fetchUnit.branch) -> io.fetchUnit.target (io.fetchUnit.target(log2Ceil(INST_WID / 8) - 1, 0).orR && io.fetchUnit.branch) -> io.fetchUnit.target
) )
) )
@ -182,8 +185,10 @@ class DecodeUnit(implicit val cpuConfig: CpuConfig) extends Module with HasExcep
io.executeStage.inst1.ex.tval := MuxCase( io.executeStage.inst1.ex.tval := MuxCase(
0.U, 0.U,
Seq( Seq(
pc(1)(log2Ceil(INST_WID / 8) - 1, 0).orR -> pc(1), io.executeStage.inst1.ex.exception(instrPageFault) -> pc(1),
io.executeStage.inst1.ex.exception(instrAccessFault) -> pc(1),
!info(1).inst_legal -> info(1).inst, !info(1).inst_legal -> info(1).inst,
pc(1)(log2Ceil(INST_WID / 8) - 1, 0).orR -> pc(1),
(io.fetchUnit.target(log2Ceil(INST_WID / 8) - 1, 0).orR && io.fetchUnit.branch) -> io.fetchUnit.target (io.fetchUnit.target(log2Ceil(INST_WID / 8) - 1, 0).orR && io.fetchUnit.branch) -> io.fetchUnit.target
) )
) )