Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(aes): fix exception check for aes64ks1i. #3845

Merged
merged 1 commit into from
Nov 25, 2024
Merged

fix(aes): fix exception check for aes64ks1i. #3845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/scala/xiangshan/backend/decode/DecodeUnit.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,10 @@ class DecodeUnit(implicit p: Parameters) extends XSModule with DecodeUnitConstan
private val isCboInval = CBO_INVAL === io.enq.ctrlFlow.instr
private val isCboZero = CBO_ZERO === io.enq.ctrlFlow.instr

// Note that rnum of aes64ks1i must be in the range 0x0..0xA. The values 0xB..0xF are reserved.
private val isAes64ks1iIllegal =
FuType.FuTypeOrR(decodedInst.fuType, FuType.bku) && (decodedInst.fuOpType === BKUOpType.aes64ks1i) && inst.isRnumIllegal

private val exceptionII =
decodedInst.selImm === SelImm.INVALID_INSTR ||
vecException.io.illegalInst ||
Expand All @@ -885,7 +889,8 @@ class DecodeUnit(implicit p: Parameters) extends XSModule with DecodeUnitConstan
(decodedInst.needFrm.vectorNeedFrm || FuType.isVectorNeedFrm(decodedInst.fuType)) && io.fromCSR.illegalInst.frm ||
io.fromCSR.illegalInst.cboZ && isCboZero ||
io.fromCSR.illegalInst.cboCF && (isCboClean || isCboFlush) ||
io.fromCSR.illegalInst.cboI && isCboInval
io.fromCSR.illegalInst.cboI && isCboInval ||
isAes64ks1iIllegal

private val exceptionVI =
io.fromCSR.virtualInst.sfenceVMA && FuType.FuTypeOrR(decodedInst.fuType, FuType.fence) && decodedInst.fuOpType === FenceOpType.sfence ||
Expand Down
9 changes: 9 additions & 0 deletions src/main/scala/xiangshan/backend/decode/isa/bitfield/RiscvInst.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,21 @@ trait BitFieldsVec { this: Riscv32BitInst =>
}
}

trait BitFieldsRVK { this: Riscv32BitInst =>
def RNUM : UInt = inst(23, 20)

def isRnumIllegal = {
this.RNUM > 0xA.U
}
}

class XSInstBitFields extends Riscv32BitInst
with BitFieldsI
with BitFieldsS
with BitFieldsCSR
with BitFieldsFp
with BitFieldsVec
with BitFieldsRVK

class InstVType extends Bundle {
val reserved = UInt(3.W)
Expand Down
Loading