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

Implement JALR, fix JAL, change how some stuff in instructions.rs is expressed

Browse Source
This commit is contained in:
taitep
2025-12-21 19:36:25 +01:00
parent 944ed573c6
commit 6c39a5eef2
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/instructions.rs
View File

@@ -16,11 +16,7 @@ pub(crate) fn find_and_exec(instr: Instruction, core: &mut Core) -> Option<Instr
0b00100 => match instr.funct3() { 0b00100 => match instr.funct3() {
// OP_IMM // OP_IMM
0b000 => Some(rvi::addi(core, instr)), 0b000 => Some(rvi::addi(core, instr)),
0b001 => match instr.funct6() { 0b001 => (instr.funct6() == 0).then(|| rvi::slli(core, instr)),
// left-shift immediate
0b000000 => Some(rvi::slli(core, instr)),
_ => None,
},
0b111 => Some(rvi::andi(core, instr)), 0b111 => Some(rvi::andi(core, instr)),
_ => None, _ => None,
}, },
@@ -47,8 +43,9 @@ pub(crate) fn find_and_exec(instr: Instruction, core: &mut Core) -> Option<Instr
_ => None, _ => None,
}, },
0b01101 => Some(rvi::lui(core, instr)), 0b01101 => Some(rvi::lui(core, instr)),
0b11011 => Some(rvi::jal(core, instr)),
0b00101 => Some(rvi::auipc(core, instr)), 0b00101 => Some(rvi::auipc(core, instr)),
0b11011 => Some(rvi::jal(core, instr)),
0b11001 => (instr.funct3() == 0).then(|| rvi::jalr(core, instr)),
_ => None, _ => None,
} }
} }

14
src/instructions/rvi.rs
View File

@@ -117,15 +117,21 @@ pub fn lui(core: &mut Core, instr: Instruction) -> InstructionResult {
InstructionResult::Normal 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 { 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()); core.pc = core.pc.wrapping_add(instr.imm_j());
InstructionResult::Normal InstructionResult::Normal
} }
pub fn auipc(core: &mut Core, instr: Instruction) -> InstructionResult { pub fn jalr(core: &mut Core, instr: Instruction) -> InstructionResult {
core.reg_write(instr.rd(), core.pc.wrapping_add(instr.imm_u())); core.reg_write(instr.rd(), core.pc.wrapping_add(4));
core.advance_pc(); core.pc = core.reg_read(instr.rs1()).wrapping_add(instr.imm_i());
InstructionResult::Normal InstructionResult::Normal
} }