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

refactor(issue): 美化代码

This commit is contained in:
Liphen 2023-12-13 16:31:36 +08:00
parent 5860aa9fa1
commit 6bd22ee617
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chisel/playground/src/defines/isa/Instructions.scala
View File

@ -84,7 +84,6 @@ object ALUOpType {
def ret = "b1011110".U def ret = "b1011110".U
def isAdd(func: UInt) = func(6) def isAdd(func: UInt) = func(6)
def pcPlus2(func: UInt) = func(5)
def isBru(func: UInt) = func(4) def isBru(func: UInt) = func(4)
def isBranch(func: UInt) = isBru(func) && !func(3) def isBranch(func: UInt) = isBru(func) && !func(3)
def isJump(func: UInt) = isBru(func) && !isBranch(func) def isJump(func: UInt) = isBru(func) && !isBranch(func)

12
chisel/playground/src/pipeline/decoder/Issue.scala
View File

@ -52,11 +52,10 @@ class Issue(implicit val config: CpuConfig) extends Module {
val data_conflict = raw_reg || load_stall val data_conflict = raw_reg || load_stall
// 指令0为bru指令 // 指令0为bru指令
val inst0_is_bru_inst = ((inst0.fusel === FuType.bru && FuType.bru =/= FuType.alu) || val is_bru = VecInit(
(inst0.fusel === FuType.alu && ALUOpType.isBru(io.decodeInst(0).op))) inst0.fusel === FuType.bru && ALUOpType.isBru(io.decodeInst(0).op),
inst1.fusel === FuType.bru && ALUOpType.isBru(io.decodeInst(1).op)
val inst1_is_bru_inst = ((inst1.fusel === FuType.bru && FuType.bru =/= FuType.alu) || )
(inst1.fusel === FuType.alu && ALUOpType.isBru(io.decodeInst(1).op)))
// 指令1是否允许执行 // 指令1是否允许执行
io.inst1.allow_to_go := io.inst1.allow_to_go :=
@ -65,8 +64,7 @@ class Issue(implicit val config: CpuConfig) extends Module {
!struct_conflict && // 无结构冲突 !struct_conflict && // 无结构冲突
!data_conflict && // 无写后读冲突 !data_conflict && // 无写后读冲突
!VecInit(FuType.mou).contains(io.decodeInst(1).fusel) && // 指令1不是mou指令 !VecInit(FuType.mou).contains(io.decodeInst(1).fusel) && // 指令1不是mou指令
!inst0_is_bru_inst && // 指令0不是bru指令 !is_bru.asUInt.orR // 指令0或指令1都不是bru指令
!inst1_is_bru_inst // 指令1不是bru指令
} else { } else {
io.inst1.allow_to_go := false.B io.inst1.allow_to_go := false.B
} }