taitep/trve
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move funct3 values to rvi.rs instead of being in opcodes.rs

Browse Source
This commit is contained in:
taitep
2025-10-14 18:21:28 +02:00
parent 6bd31e73fb
commit 7a519924cb
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/instructions/opcodes.rs
View File

@@ -1,10 +1,5 @@
//! Includes opcodes, funct3 values, and match/mask values.
//! Opcodes (unless compressed) have the last 2 bits stripped off as they are always 1s for non-compressed instructions. //! Opcodes (unless compressed) have the last 2 bits stripped off as they are always 1s for non-compressed instructions.
pub(super) const OP_IMM: u8 = 0b00100; pub(super) const OP_IMM: u8 = 0b00100;
pub(super) const FUNCT3_ADDI: u8 = 0b000;
pub(super) const STORE: u8 = 0b01000; pub(super) const STORE: u8 = 0b01000;
pub(super) const FUNCT3_SD: u8 = 0b011;

7
src/instructions/rvi.rs
View File

@@ -5,18 +5,17 @@ use crate::{
instructions::{ instructions::{
OpcodeHandler, OpcodeHandler,
gen_tools::insert_funct3_splitter, gen_tools::insert_funct3_splitter,
opcodes::{FUNCT3_ADDI, FUNCT3_SD, OP_IMM, STORE}, opcodes::{OP_IMM, STORE},
}, },
mem::PageNum, mem::PageNum,
}; };
pub(super) fn add_instrs(list: &mut [OpcodeHandler; 32]) { pub(super) fn add_instrs(list: &mut [OpcodeHandler; 32]) {
let funct3_split_op_imm = insert_funct3_splitter(&mut list[OP_IMM as usize].splitter); let funct3_split_op_imm = insert_funct3_splitter(&mut list[OP_IMM as usize].splitter);
funct3_split_op_imm[FUNCT3_ADDI as usize].handler = funct3_split_op_imm[0b000].handler = Some(super::InstructionHandler { runner: addi }); // ADDI
Some(super::InstructionHandler { runner: addi });
let funct3_split_store = insert_funct3_splitter(&mut list[STORE as usize].splitter); let funct3_split_store = insert_funct3_splitter(&mut list[STORE as usize].splitter);
funct3_split_store[FUNCT3_SD as usize].handler = Some(super::InstructionHandler { runner: sd }) funct3_split_store[0b011].handler = Some(super::InstructionHandler { runner: sd }) // SD
} }
fn addi(core: &mut Core, instr: Instruction) -> InstructionResult { fn addi(core: &mut Core, instr: Instruction) -> InstructionResult {