diff options
Diffstat (limited to 'src/simulator.rs')
| -rw-r--r-- | src/simulator.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/simulator.rs b/src/simulator.rs index 607a3b5..bf39c5e 100644 --- a/src/simulator.rs +++ b/src/simulator.rs @@ -14,6 +14,7 @@ struct RegisterFile { #[derive(Clone)] struct Core { + // TODO: directly encode PC as u32, as architecturally specified pc: usize, registers: RegisterFile, running: bool, @@ -106,15 +107,17 @@ impl Simulator { core.running = false; } else { - let target = ((pc as i32) + inst.i_imm()) as usize; + let target = (((pc as i32) + inst.i_imm()) & 0xFFFFFFFE) as usize; core.registers.write_word(inst.rd(), pc + 4); core.pc = target; + return; } }, isa::opcodes::JAL => { let target = ((pc as i32) + inst.uj_imm()) as usize; core.registers.write_word(inst.rd(), pc + 4); core.pc = target; + return; } isa::opcodes::BRANCH => { |