diff options
| author | taitep <taitep@taitep.se> | 2025-10-14 18:21:28 +0200 |
|---|---|---|
| committer | taitep <taitep@taitep.se> | 2025-10-14 18:21:28 +0200 |
| commit | 7a519924cb15f16a683782391e70a6e34700612a (patch) | |
| tree | e53218460f0a357f3e1ceb7d524258999b0802d4 /src | |
| parent | 6bd31e73fb910d59066adeb11b9d85411e2c743e (diff) | |
Move funct3 values to rvi.rs instead of being in opcodes.rs
Diffstat (limited to 'src')
| -rw-r--r-- | src/instructions/opcodes.rs | 5 | ||||
| -rw-r--r-- | src/instructions/rvi.rs | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/instructions/opcodes.rs b/src/instructions/opcodes.rs index 04059a2..7115820 100644 --- a/src/instructions/opcodes.rs +++ b/src/instructions/opcodes.rs @@ -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. pub(super) const OP_IMM: u8 = 0b00100; -pub(super) const FUNCT3_ADDI: u8 = 0b000; - pub(super) const STORE: u8 = 0b01000; - -pub(super) const FUNCT3_SD: u8 = 0b011; diff --git a/src/instructions/rvi.rs b/src/instructions/rvi.rs index e3c0e09..24d45a1 100644 --- a/src/instructions/rvi.rs +++ b/src/instructions/rvi.rs @@ -5,18 +5,17 @@ use crate::{ instructions::{ OpcodeHandler, gen_tools::insert_funct3_splitter, - opcodes::{FUNCT3_ADDI, FUNCT3_SD, OP_IMM, STORE}, + opcodes::{OP_IMM, STORE}, }, mem::PageNum, }; pub(super) fn add_instrs(list: &mut [OpcodeHandler; 32]) { let funct3_split_op_imm = insert_funct3_splitter(&mut list[OP_IMM as usize].splitter); - funct3_split_op_imm[FUNCT3_ADDI as usize].handler = - Some(super::InstructionHandler { runner: addi }); + funct3_split_op_imm[0b000].handler = Some(super::InstructionHandler { runner: addi }); // ADDI 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 { |