cpu: arm: Fix R14 for branch with link instruction

Former-commit-id: bc927d86e5a170b0e4568b4ceeb7832d23ad309c
2019-07-01 19:24:52 +03:00 · 2019-07-01 19:24:52 +03:00 · 2081b70ee2
commit 2081b70ee2
parent ea8c4f2a60
1 changed files with 1 additions and 1 deletions
--- a/src/arm7tdmi/arm/exec.rs
+++ b/src/arm7tdmi/arm/exec.rs
@ -42,7 +42,7 @@ impl Core {
        insn: ArmInstruction,
    ) -> CpuResult<CpuPipelineAction> {
        if insn.link_flag() {
-            self.set_reg(14, self.pc & !0b1);
+            self.set_reg(14, (insn.pc + (self.word_size() as u32)) & !0b1);
        }

        // +1N