Skip to content

Feature/zbb #43

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 7 commits into from
Oct 5, 2025
Merged

Feature/zbb #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
70f3082
[add] add instruction/zbb_exntnsion.rs
Alignof Feb 4, 2025
c3d594a
[add] add decode/zbb_exntnsion.rs
Alignof Feb 4, 2025
3cb7014
[fix] fix `parse_expansion`
Alignof Jun 28, 2025
a5a91b5
[update] re-generate zbb_extension.rs
Alignof Jul 6, 2025
52ed890
[add] add doc comments to `ZbbOpcode`
Alignof Oct 5, 2025
8ca923d
[refactor] fix cargo clippy warnings
Alignof Oct 5, 2025
fa5a0c4
[refactor] add under score derimiter to address clippy warnings
Alignof Oct 5, 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
1 change: 1 addition & 0 deletions src/decode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ mod base_i;
mod c_extension;
mod m_extension;
mod priv_extension;
mod zbb_extension;
mod zicboz_extension;
mod zicfiss_extension;
mod zicntr_extension;
Expand Down
38 changes: 36 additions & 2 deletions src/decode/inst_32.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::{
a_extension, base_i, m_extension, priv_extension, zicboz_extension, zicfiss_extension,
zicntr_extension, zicsr_extension, zifencei_extension,
a_extension, base_i, m_extension, priv_extension, zbb_extension, zicboz_extension,
zicfiss_extension, zicntr_extension, zicsr_extension, zifencei_extension,
};
use super::{Decode, DecodeUtil, DecodingError};
use crate::instruction::{InstFormat, Instruction, OpcodeKind};
Expand Down Expand Up @@ -42,6 +42,7 @@ impl Decode for u32 {
Ok(Extensions::Zicsr) => Ok(OpcodeKind::Zicsr(zicsr_extension::bit_32::parse_opcode(
self,
)?)),
Ok(Extensions::Zbb) => Ok(OpcodeKind::Zbb(zbb_extension::bit_32::parse_opcode(self)?)),
Ok(Extensions::Zicfiss) => Ok(OpcodeKind::Zicfiss(
zicfiss_extension::bit_32::parse_opcode(self)?,
)),
Expand All @@ -64,6 +65,7 @@ impl Decode for u32 {
OpcodeKind::BaseI(opc) => Ok(base_i::bit_32::parse_rd(self, opc)),
OpcodeKind::M(opc) => Ok(m_extension::bit_32::parse_rd(self, opc)),
OpcodeKind::A(opc) => Ok(a_extension::bit_32::parse_rd(self, opc)),
OpcodeKind::Zbb(opc) => Ok(zbb_extension::bit_32::parse_rd(self, opc)),
OpcodeKind::Zifencei(opc) => Ok(zifencei_extension::bit_32::parse_rd(self, opc)),
OpcodeKind::Zicsr(opc) => Ok(zicsr_extension::bit_32::parse_rd(self, opc)),
OpcodeKind::Zicfiss(opc) => Ok(zicfiss_extension::bit_32::parse_rd(self, opc)),
Expand All @@ -79,6 +81,7 @@ impl Decode for u32 {
OpcodeKind::BaseI(opc) => Ok(base_i::bit_32::parse_rs1(self, opc)),
OpcodeKind::M(opc) => Ok(m_extension::bit_32::parse_rs1(self, opc)),
OpcodeKind::A(opc) => Ok(a_extension::bit_32::parse_rs1(self, opc)),
OpcodeKind::Zbb(opc) => Ok(zbb_extension::bit_32::parse_rs1(self, opc)),
OpcodeKind::Zifencei(opc) => Ok(zifencei_extension::bit_32::parse_rs1(self, opc)),
OpcodeKind::Zicsr(opc) => Ok(zicsr_extension::bit_32::parse_rs1(self, opc)),
OpcodeKind::Zicfiss(opc) => Ok(zicfiss_extension::bit_32::parse_rs1(self, opc)),
Expand All @@ -94,6 +97,7 @@ impl Decode for u32 {
OpcodeKind::BaseI(opc) => Ok(base_i::bit_32::parse_rs2(self, opc)),
OpcodeKind::M(opc) => Ok(m_extension::bit_32::parse_rs2(self, opc)),
OpcodeKind::A(opc) => Ok(a_extension::bit_32::parse_rs2(self, opc)),
OpcodeKind::Zbb(opc) => Ok(zbb_extension::bit_32::parse_rs2(self, opc)),
OpcodeKind::Zifencei(opc) => Ok(zifencei_extension::bit_32::parse_rs2(self, opc)),
OpcodeKind::Zicsr(opc) => Ok(zicsr_extension::bit_32::parse_rs2(self, opc)),
OpcodeKind::Zicfiss(opc) => Ok(zicfiss_extension::bit_32::parse_rs2(self, opc)),
Expand All @@ -109,6 +113,7 @@ impl Decode for u32 {
OpcodeKind::BaseI(opc) => Ok(base_i::bit_32::parse_imm(self, opc, isa)),
OpcodeKind::M(opc) => Ok(m_extension::bit_32::parse_imm(self, opc)),
OpcodeKind::A(opc) => Ok(a_extension::bit_32::parse_imm(self, opc)),
OpcodeKind::Zbb(opc) => Ok(zbb_extension::bit_32::parse_imm(self, opc)),
OpcodeKind::Zifencei(opc) => Ok(zifencei_extension::bit_32::parse_imm(self, opc)),
OpcodeKind::Zicsr(opc) => Ok(zicsr_extension::bit_32::parse_imm(self, opc)),
OpcodeKind::Zicfiss(opc) => Ok(zicfiss_extension::bit_32::parse_imm(self, opc)),
Expand Down Expand Up @@ -139,6 +144,14 @@ impl DecodeUtil for u32 {
0b010 => Ok(Extensions::Zicboz),
_ => Err(DecodingError::UnknownExtension),
},
0b001_0011 => match funct3 {
0b001 | 0b101 => Ok(Extensions::Zbb),
_ => Ok(Extensions::BaseI),
},
0b001_1011 => match funct3 {
0b001 | 0b101 => Ok(Extensions::Zbb),
_ => Ok(Extensions::BaseI),
},
0b010_1111 => match funct5 {
0b00000 | 0b00001 | 0b00010 | 0b00011 | 0b00100 | 0b01000 | 0b01100 | 0b10000
| 0b10100 | 0b11000 | 0b11100 => Ok(Extensions::A),
Expand All @@ -147,11 +160,32 @@ impl DecodeUtil for u32 {
},
0b011_0011 => match funct7 {
0b000_0001 => Ok(Extensions::M),
0b000_0100 => match funct3 {
0b001 | 0b100 | 0b101 | 0b110 | 0b111 => Ok(Extensions::Zbb),
_ => Ok(Extensions::BaseI),
},
0b000_0101 => match funct3 {
0b001..=0b111 => Ok(Extensions::Zbb),
_ => Ok(Extensions::BaseI),
},
0b001_0100 | 0b011_0100 => match funct3 {
0b001 => Ok(Extensions::Zbb),
_ => Ok(Extensions::BaseI),
},
0b010_0000 => match funct3 {
0b100 | 0b110 | 0b111 => Ok(Extensions::Zbb),
_ => Ok(Extensions::BaseI),
},
0b011_0000 => match funct3 {
0b001 | 0b101 => Ok(Extensions::Zbb),
_ => Ok(Extensions::BaseI),
},
_ => Ok(Extensions::BaseI),
},
0b011_1011 => match funct7 {
0b000_0000 | 0b010_0000 => Ok(Extensions::BaseI),
0b000_0001 => Ok(Extensions::M),
0b000_0100 | 0b011_0000 => Ok(Extensions::Zbb),
_ => Err(DecodingError::UnknownExtension),
},
0b111_0011 => match funct3 {
Expand Down
Loading
Loading