diff options
Diffstat (limited to 'src/instructions/rvi.rs')
| -rw-r--r-- | src/instructions/rvi.rs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/instructions/rvi.rs b/src/instructions/rvi.rs index 5c06b62..239ae98 100644 --- a/src/instructions/rvi.rs +++ b/src/instructions/rvi.rs @@ -117,15 +117,21 @@ pub fn lui(core: &mut Core, instr: Instruction) -> InstructionResult { InstructionResult::Normal } +pub fn auipc(core: &mut Core, instr: Instruction) -> InstructionResult { + core.reg_write(instr.rd(), core.pc.wrapping_add(instr.imm_u())); + core.advance_pc(); + InstructionResult::Normal +} + pub fn jal(core: &mut Core, instr: Instruction) -> InstructionResult { - core.reg_write(instr.rd(), core.pc); + core.reg_write(instr.rd(), core.pc.wrapping_add(4)); core.pc = core.pc.wrapping_add(instr.imm_j()); InstructionResult::Normal } -pub fn auipc(core: &mut Core, instr: Instruction) -> InstructionResult { - core.reg_write(instr.rd(), core.pc.wrapping_add(instr.imm_u())); - core.advance_pc(); +pub fn jalr(core: &mut Core, instr: Instruction) -> InstructionResult { + core.reg_write(instr.rd(), core.pc.wrapping_add(4)); + core.pc = core.reg_read(instr.rs1()).wrapping_add(instr.imm_i()); InstructionResult::Normal } |