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

Add JAL and change some of the formatting on previous instructions to be cleaner

Browse Source
This commit is contained in:
taitep
2025-12-21 12:20:30 +01:00
parent ac9506a1a7
commit 23647ae966
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/instructions.rs
View File

@@ -29,6 +29,7 @@ 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)),
_ => None, _ => None,
} }
} }

14
src/instructions/rvi.rs
View File

@@ -11,7 +11,7 @@ use crate::{
mem::PageNum, mem::PageNum,
}; };
pub(super) fn addi(core: &mut Core, instr: Instruction) -> InstructionResult { pub fn addi(core: &mut Core, instr: Instruction) -> InstructionResult {
core.reg_write( core.reg_write(
instr.rd(), instr.rd(),
core.reg_read(instr.rs1()).wrapping_add(instr.imm_i()), core.reg_read(instr.rs1()).wrapping_add(instr.imm_i()),
@@ -22,7 +22,7 @@ pub(super) fn addi(core: &mut Core, instr: Instruction) -> InstructionResult {
InstructionResult::Normal InstructionResult::Normal
} }
pub(super) fn addiw(core: &mut Core, instr: Instruction) -> InstructionResult { pub fn addiw(core: &mut Core, instr: Instruction) -> InstructionResult {
let res = core.reg_read(instr.rs1()).wrapping_add(instr.imm_i()) as i32; let res = core.reg_read(instr.rs1()).wrapping_add(instr.imm_i()) as i32;
core.reg_write(instr.rd(), res as i64 as u64); core.reg_write(instr.rd(), res as i64 as u64);
@@ -33,7 +33,7 @@ pub(super) fn addiw(core: &mut Core, instr: Instruction) -> InstructionResult {
} }
// TODO: Support misaligned memory access // TODO: Support misaligned memory access
pub(super) fn sd(core: &mut Core, instr: Instruction) -> InstructionResult { pub fn sd(core: &mut Core, instr: Instruction) -> InstructionResult {
let addr = core.reg_read(instr.rs1()).wrapping_add(instr.imm_s()); let addr = core.reg_read(instr.rs1()).wrapping_add(instr.imm_s());
if !addr.is_multiple_of(std::mem::size_of::<DWord>() as Addr) { if !addr.is_multiple_of(std::mem::size_of::<DWord>() as Addr) {
@@ -53,8 +53,14 @@ pub(super) fn sd(core: &mut Core, instr: Instruction) -> InstructionResult {
} }
} }
pub(super) fn lui(core: &mut Core, instr: Instruction) -> InstructionResult { pub fn lui(core: &mut Core, instr: Instruction) -> InstructionResult {
core.reg_write(instr.rd(), instr.imm_u()); core.reg_write(instr.rd(), instr.imm_u());
core.pc = core.pc.wrapping_add(4); core.pc = core.pc.wrapping_add(4);
InstructionResult::Normal InstructionResult::Normal
} }
pub fn jal(core: &mut Core, instr: Instruction) -> InstructionResult {
core.reg_write(instr.rd(), core.pc);
core.pc = core.pc.wrapping_add(instr.imm_j());
InstructionResult::Normal
}