Skip to content

Commit

Permalink
Merge pull request #35 from Alignof/develop
Browse files Browse the repository at this point in the history 
Ver 1.3.0
  • Loading branch information
@Alignof
Alignof authored Dec 27, 2024
2 parents b4cca46 + 49af0f6 commit ed83d19
Show file tree
Hide file tree
Showing 27 changed files with 2,090 additions and 1,914 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "raki"
version = "1.2.0"
version = "1.3.0"
edition = "2021"
authors = ["Norimasa Takana <alignof@outlook.com>"]
repository = "https://github.com/Alignof/raki"
Expand Down
11 changes: 11 additions & 0 deletions src/decode.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
mod inst_16;
mod inst_32;

mod a_extension;
mod base_i;
mod c_extension;
mod m_extension;
mod priv_extension;
mod zicboz_extension;
mod zicfiss_extension;
mod zicntr_extension;
mod zicsr_extension;
mod zifencei_extension;

use crate::instruction::{Instruction, Opcode, OpcodeKind};
use crate::{Extensions, Isa};

Expand Down
215 changes: 215 additions & 0 deletions src/decode/a_extension.rs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
pub mod bit_32 {
use super::super::{only_rv64, DecodeUtil, DecodingError};
use crate::instruction::a_extension::AOpcode;
use crate::Isa;

pub fn parse_opcode(inst: u32, isa: Isa) -> Result<AOpcode, DecodingError> {
let opmap: u8 = u8::try_from(inst.slice(6, 0)).unwrap();
let funct3: u8 = u8::try_from(inst.slice(14, 12)).unwrap();
let funct7: u8 = u8::try_from(inst.slice(31, 27)).unwrap();

match opmap {
0b010_1111 => match funct3 {
0b010 => match funct7 {
0b00010 => Ok(AOpcode::LR_W),
0b00011 => Ok(AOpcode::SC_W),
0b00001 => Ok(AOpcode::AMOSWAP_W),
0b00000 => Ok(AOpcode::AMOADD_W),
0b00100 => Ok(AOpcode::AMOXOR_W),
0b01100 => Ok(AOpcode::AMOAND_W),
0b01000 => Ok(AOpcode::AMOOR_W),
0b10000 => Ok(AOpcode::AMOMIN_W),
0b10100 => Ok(AOpcode::AMOMAX_W),
0b11000 => Ok(AOpcode::AMOMINU_W),
0b11100 => Ok(AOpcode::AMOMAXU_W),
_ => Err(DecodingError::InvalidFunct7),
},
0b011 => match funct7 {
0b00010 => only_rv64(AOpcode::LR_D, isa),
0b00011 => only_rv64(AOpcode::SC_D, isa),
0b00001 => only_rv64(AOpcode::AMOSWAP_D, isa),
0b00000 => only_rv64(AOpcode::AMOADD_D, isa),
0b00100 => only_rv64(AOpcode::AMOXOR_D, isa),
0b01100 => only_rv64(AOpcode::AMOAND_D, isa),
0b01000 => only_rv64(AOpcode::AMOOR_D, isa),
0b10000 => only_rv64(AOpcode::AMOMIN_D, isa),
0b10100 => only_rv64(AOpcode::AMOMAX_D, isa),
0b11000 => only_rv64(AOpcode::AMOMINU_D, isa),
0b11100 => only_rv64(AOpcode::AMOMAXU_D, isa),
_ => Err(DecodingError::InvalidFunct7),
},
_ => Err(DecodingError::InvalidFunct3),
},
_ => Err(DecodingError::InvalidOpcode),
}
}

#[allow(clippy::unnecessary_wraps)]
pub fn parse_rd(inst: u32, opkind: &AOpcode) -> Option<usize> {
let rd: usize = inst.slice(11, 7) as usize;

match opkind {
AOpcode::LR_W
| AOpcode::SC_W
| AOpcode::AMOSWAP_W
| AOpcode::AMOADD_W
| AOpcode::AMOXOR_W
| AOpcode::AMOAND_W
| AOpcode::AMOOR_W
| AOpcode::AMOMIN_W
| AOpcode::AMOMAX_W
| AOpcode::AMOMINU_W
| AOpcode::AMOMAXU_W
| AOpcode::LR_D
| AOpcode::SC_D
| AOpcode::AMOSWAP_D
| AOpcode::AMOADD_D
| AOpcode::AMOXOR_D
| AOpcode::AMOAND_D
| AOpcode::AMOOR_D
| AOpcode::AMOMIN_D
| AOpcode::AMOMAX_D
| AOpcode::AMOMINU_D
| AOpcode::AMOMAXU_D => Some(rd),
}
}

#[allow(clippy::unnecessary_wraps)]
pub fn parse_rs1(inst: u32, opkind: &AOpcode) -> Option<usize> {
let rs1: usize = inst.slice(19, 15) as usize;

match opkind {
AOpcode::LR_W
| AOpcode::SC_W
| AOpcode::AMOSWAP_W
| AOpcode::AMOADD_W
| AOpcode::AMOXOR_W
| AOpcode::AMOAND_W
| AOpcode::AMOOR_W
| AOpcode::AMOMIN_W
| AOpcode::AMOMAX_W
| AOpcode::AMOMINU_W
| AOpcode::AMOMAXU_W
| AOpcode::LR_D
| AOpcode::SC_D
| AOpcode::AMOSWAP_D
| AOpcode::AMOADD_D
| AOpcode::AMOXOR_D
| AOpcode::AMOAND_D
| AOpcode::AMOOR_D
| AOpcode::AMOMIN_D
| AOpcode::AMOMAX_D
| AOpcode::AMOMINU_D
| AOpcode::AMOMAXU_D => Some(rs1),
}
}

pub fn parse_rs2(inst: u32, opkind: &AOpcode) -> Option<usize> {
let rs2: usize = inst.slice(24, 20) as usize;

match opkind {
AOpcode::SC_W
| AOpcode::AMOSWAP_W
| AOpcode::AMOADD_W
| AOpcode::AMOXOR_W
| AOpcode::AMOAND_W
| AOpcode::AMOOR_W
| AOpcode::AMOMIN_W
| AOpcode::AMOMAX_W
| AOpcode::AMOMINU_W
| AOpcode::AMOMAXU_W
| AOpcode::SC_D
| AOpcode::AMOSWAP_D
| AOpcode::AMOADD_D
| AOpcode::AMOXOR_D
| AOpcode::AMOAND_D
| AOpcode::AMOOR_D
| AOpcode::AMOMIN_D
| AOpcode::AMOMAX_D
| AOpcode::AMOMINU_D
| AOpcode::AMOMAXU_D => Some(rs2),
_ => None,
}
}

#[allow(non_snake_case)]
#[allow(clippy::unnecessary_wraps, clippy::cast_possible_wrap)]
pub fn parse_imm(inst: u32, opkind: &AOpcode) -> Option<i32> {
let aq_and_rl = || inst.slice(26, 25) as i32;

match opkind {
AOpcode::LR_W
| AOpcode::SC_W
| AOpcode::AMOSWAP_W
| AOpcode::AMOADD_W
| AOpcode::AMOXOR_W
| AOpcode::AMOAND_W
| AOpcode::AMOOR_W
| AOpcode::AMOMIN_W
| AOpcode::AMOMAX_W
| AOpcode::AMOMINU_W
| AOpcode::AMOMAXU_W
| AOpcode::LR_D
| AOpcode::SC_D
| AOpcode::AMOSWAP_D
| AOpcode::AMOADD_D
| AOpcode::AMOXOR_D
| AOpcode::AMOAND_D
| AOpcode::AMOOR_D
| AOpcode::AMOMIN_D
| AOpcode::AMOMAX_D
| AOpcode::AMOMINU_D
| AOpcode::AMOMAXU_D => Some(aq_and_rl()),
}
}
}

#[cfg(test)]
#[allow(unused_variables)]
mod test_a {
#[test]
#[allow(overflowing_literals)]
fn a_decode_test() {
use crate::instruction::a_extension::AOpcode;
use crate::{Decode, Isa, OpcodeKind};

let test_32 = |inst_32: u32,
op: OpcodeKind,
rd: Option<usize>,
rs1: Option<usize>,
rs2: Option<usize>,
imm: Option<i32>| {
let op_32 = inst_32.parse_opcode(Isa::Rv64).unwrap();
assert!(matches!(&op_32, op));
assert_eq!(inst_32.parse_rd(&op_32).unwrap(), rd);
assert_eq!(inst_32.parse_rs1(&op_32).unwrap(), rs1);
assert_eq!(inst_32.parse_rs2(&op_32).unwrap(), rs2);
assert_eq!(inst_32.parse_imm(&op_32, Isa::Rv64).unwrap(), imm);
};

test_32(
0x04d7_27af,
OpcodeKind::A(AOpcode::AMOADD_W),
Some(15),
Some(14),
Some(13),
Some(2),
);
test_32(
0x1007b62f,
OpcodeKind::A(AOpcode::LR_D),
Some(12),
Some(15),
None,
Some(0),
);
test_32(
0x60f6302f,
OpcodeKind::A(AOpcode::AMOAND_D),
Some(0),
Some(12),
Some(15),
Some(0),
);
}
}
Loading

0 comments on commit ed83d19

Please sign in to comment.