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

Fix imm_or_funct7 #498

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Fix imm_or_funct7 #498

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
22 changes: 11 additions & 11 deletions ceno_emul/src/rv32im.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,17 +284,17 @@ impl DecodedInstruction {

/// Get the decoded immediate, or 2^shift, or the funct7 field, depending on the instruction format.
pub fn imm_or_funct7(&self) -> u32 {
match self.codes() {
InsnCodes { format: R, .. } => self.func7,
InsnCodes {
kind: SLLI | SRLI | SRAI,
..
} => 1 << self.rs2(), // decode the shift as a multiplication by 2.pow(rs2)
InsnCodes { format: I, .. } => self.imm_i(),
InsnCodes { format: S, .. } => self.imm_s(),
InsnCodes { format: B, .. } => self.imm_b(),
InsnCodes { format: U, .. } => self.imm_u(),
InsnCodes { format: J, .. } => self.imm_j(),
match self.codes().format {
R => self.func7,
I => match self.codes().kind {
// decode the shift as a multiplication/division by 1 << immediate
SLLI | SRLI | SRAI => 1 << (self.imm_i() & 0x1f),
_ => self.imm_i(),
},
S => self.imm_s(),
B => self.imm_b(),
U => self.imm_u(),
J => self.imm_j(),
}
}

Expand Down
Loading