diff options
Diffstat (limited to 'src/instructions.rs')
| -rw-r--r-- | src/instructions.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/instructions.rs b/src/instructions.rs index bf942ee..e72dfb5 100644 --- a/src/instructions.rs +++ b/src/instructions.rs @@ -16,11 +16,7 @@ pub(crate) fn find_and_exec(instr: Instruction, core: &mut Core) -> Option<Instr 0b00100 => match instr.funct3() { // OP_IMM 0b000 => Some(rvi::addi(core, instr)), - 0b001 => match instr.funct6() { - // left-shift immediate - 0b000000 => Some(rvi::slli(core, instr)), - _ => None, - }, + 0b001 => (instr.funct6() == 0).then(|| rvi::slli(core, instr)), 0b111 => Some(rvi::andi(core, instr)), _ => None, }, @@ -47,8 +43,9 @@ pub(crate) fn find_and_exec(instr: Instruction, core: &mut Core) -> Option<Instr _ => None, }, 0b01101 => Some(rvi::lui(core, instr)), - 0b11011 => Some(rvi::jal(core, instr)), 0b00101 => Some(rvi::auipc(core, instr)), + 0b11011 => Some(rvi::jal(core, instr)), + 0b11001 => (instr.funct3() == 0).then(|| rvi::jalr(core, instr)), _ => None, } } |