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

1 files changed, 3 insertions, 4 deletions

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 {