diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core.rs | 4 | ||||
| -rw-r--r-- | src/instructions/rvi.rs | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/core.rs b/src/core.rs index 4c17070..ce704fb 100644 --- a/src/core.rs +++ b/src/core.rs @@ -92,4 +92,8 @@ impl Core { } self.x_regs[id as usize] = value; } + + pub(crate) fn advance_pc(&mut self) { + self.pc = self.pc.wrapping_add(4); + } } diff --git a/src/instructions/rvi.rs b/src/instructions/rvi.rs index 98fcb07..a212b8d 100644 --- a/src/instructions/rvi.rs +++ b/src/instructions/rvi.rs @@ -17,7 +17,7 @@ pub fn addi(core: &mut Core, instr: Instruction) -> InstructionResult { core.reg_read(instr.rs1()).wrapping_add(instr.imm_i()), ); - core.pc = core.pc.wrapping_add(4); + core.advance_pc(); InstructionResult::Normal } @@ -27,7 +27,7 @@ pub fn addiw(core: &mut Core, instr: Instruction) -> InstructionResult { core.reg_write(instr.rd(), res as i64 as u64); - core.pc = core.pc.wrapping_add(4); + core.advance_pc(); InstructionResult::Normal } @@ -46,7 +46,7 @@ pub fn sd(core: &mut Core, instr: Instruction) -> InstructionResult { match core.mem.write_dword(page, offset, value) { Ok(_) => { - core.pc = core.pc.wrapping_add(4); + core.advance_pc(); InstructionResult::Normal } Err(_) => InstructionResult::Exception(()), @@ -62,7 +62,7 @@ pub fn sb(core: &mut Core, instr: Instruction) -> InstructionResult { match core.mem.write_byte(page, offset, value) { Ok(_) => { - core.pc = core.pc.wrapping_add(4); + core.advance_pc(); InstructionResult::Normal } Err(_) => InstructionResult::Exception(()), @@ -79,7 +79,7 @@ pub fn lb(core: &mut Core, instr: Instruction) -> InstructionResult { Ok(x) => { let x = x as i8 as i64 as DWord; core.reg_write(instr.rd(), x); - core.pc = core.pc.wrapping_add(4); + core.advance_pc(); InstructionResult::Normal } Err(_) => InstructionResult::Exception(()), @@ -96,7 +96,7 @@ pub fn lbu(core: &mut Core, instr: Instruction) -> InstructionResult { Ok(x) => { let x = x as DWord; core.reg_write(instr.rd(), x); - core.pc = core.pc.wrapping_add(4); + core.advance_pc(); InstructionResult::Normal } Err(_) => InstructionResult::Exception(()), @@ -105,7 +105,7 @@ pub fn lbu(core: &mut Core, instr: Instruction) -> InstructionResult { pub fn lui(core: &mut Core, instr: Instruction) -> InstructionResult { core.reg_write(instr.rd(), instr.imm_u()); - core.pc = core.pc.wrapping_add(4); + core.advance_pc(); InstructionResult::Normal } @@ -118,7 +118,7 @@ pub fn jal(core: &mut Core, instr: Instruction) -> InstructionResult { pub fn slli(core: &mut Core, instr: Instruction) -> InstructionResult { core.reg_write(instr.rd(), core.reg_read(instr.rs1()) << instr.imm_shamt()); - core.pc = core.pc.wrapping_add(4); + core.advance_pc(); InstructionResult::Normal } |