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

Fix LR when changing cpu modes

Browse source 
Former-commit-id: 0ac911ee90758b9bffaafd459f1d9bca86d5064d
This commit is contained in:
Michel Heily 2019-07-04 01:37:05 +03:00
parent 6a3d4358da
commit 3541779fbf
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/arm7tdmi/cpu.rs
View file

@ -134,8 +134,8 @@ impl Core {
self.gpr[13] = self.gpr_banked_r13[next_index];
self.gpr_banked_r14[curr_index] = self.gpr[14];
self.gpr_banked_r14[next_index] = self.pc; // Store the return address in LR_mode
self.gpr[14] = self.gpr_banked_r14[next_index];
self.gpr_banked_r14[next_index] = self.get_next_pc(); // Store the return address in LR_mode
if new_mode == CpuMode::Fiq {
for r in 0..5 {