Skip to content

Fix U-type immediate decoding #41

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

Merged
Alignof merged 3 commits into from
Jun 29, 2025
Merged

Fix U-type immediate decoding #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df98a2e
[add] add testcase for U, J, B-type imm
Alignof Jun 29, 2025
814ac3b
[!][fix] fix decoding immediate in U-type
Alignof Jun 29, 2025
a296d04
[refactor] allow unused function `test_(16|32)_in_rv32`
Alignof Jun 29, 2025
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
44 changes: 34 additions & 10 deletions src/decode/base_i.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ pub mod bit_32 {
#[allow(clippy::cast_possible_wrap)]
#[allow(non_snake_case)]
pub fn parse_imm(inst: u32, opkind: &BaseIOpcode, isa: Isa) -> Option<i32> {
let U_type = || (inst.slice(31, 12) << 12) as i32;
let U_type = || inst.slice(31, 12) as i32;
let I_type = || {
let imm32 = inst.slice(31, 20) as i32;
inst.to_signed_nbit(imm32, 12)
Expand Down Expand Up @@ -348,28 +348,52 @@ mod test_basei {
use crate::OpcodeKind;

test_32_in_rv64(
0b1000_0000_0000_0000_0000_0000_1011_0111,
0xfdead737,
OpcodeKind::BaseI(BaseIOpcode::LUI),
Some(1),
Some(14),
None,
None,
Some(0x8000_0000),
Some(0xfdead),
);
test_32_in_rv64(
0b0000_0000_0000_0000_0000_0010_1001_0111,
0x1597,
OpcodeKind::BaseI(BaseIOpcode::AUIPC),
Some(5),
Some(11),
None,
None,
Some(0),
Some(0x1),
);
test_32_in_rv64(
0x013f9517,
OpcodeKind::BaseI(BaseIOpcode::AUIPC),
Some(10),
None,
None,
Some(0x13f9),
);
test_32_in_rv64(
0x009bc097,
OpcodeKind::BaseI(BaseIOpcode::AUIPC),
Some(1),
None,
None,
Some(0x9bc),
);
test_32_in_rv64(
0b1111_1111_1001_1111_1111_0000_0110_1111,
0x9d3ff0ef,
OpcodeKind::BaseI(BaseIOpcode::JAL),
Some(0),
Some(1),
None,
None,
Some(-8),
Some(-1582),
);
test_32_in_rv64(
0x02e78263,
OpcodeKind::BaseI(BaseIOpcode::BEQ),
None,
Some(15),
Some(14),
Some(36),
);
test_32_in_rv64(
0b1111_1110_0010_0000_1000_1110_1010_0011,
Expand Down
4 changes: 2 additions & 2 deletions src/decode/inst_16.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,10 @@ pub fn test_16(
location.line()
);
}

#[cfg(test)]
#[track_caller]
pub fn test_16_in_rv16(
#[allow(dead_code)]
pub fn test_16_in_rv32(
inst_16: u16,
op: OpcodeKind,
rd: Option<usize>,
Expand Down
1 change: 1 addition & 0 deletions src/decode/inst_32.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ pub fn test_32(

#[cfg(test)]
#[track_caller]
#[allow(dead_code)]
pub fn test_32_in_rv32(
inst_32: u32,
op: OpcodeKind,
Expand Down