devraza/rustboyadvance-ng
Archived
1
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Align to halfword for thumb branch long instructions

Browse source 
Former-commit-id: f75e4baf003dcb7c535db3692383cc95575dfd81
This commit is contained in:
Michel Heily 2019-07-29 01:55:16 +03:00
parent e962150aaf
commit 90edebbe82
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/arm7tdmi/thumb/exec.rs
View file

@ -411,7 +411,7 @@ impl Core {
if insn.flag(ThumbInstruction::FLAG_LOW_OFFSET) { if insn.flag(ThumbInstruction::FLAG_LOW_OFFSET) {
off = off << 1; off = off << 1;
let next_pc = (self.pc - 2) | 1; let next_pc = (self.pc - 2) | 1;
self.pc = (self.gpr[REG_LR] as i32).wrapping_add(off) as u32; self.pc = ((self.gpr[REG_LR] & !1) as i32).wrapping_add(off) as u32;
self.gpr[REG_LR] = next_pc; self.gpr[REG_LR] = next_pc;
self.flush_pipeline(); self.flush_pipeline();