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

fix(tests): Fix thumb t225

Browse source 
THUMB 14: Push / pop do not align base


Former-commit-id: e8f511387edf5bd2f3991558f7757f997d0289c7
This commit is contained in:
Michel Heily 2020-01-17 13:04:14 +02:00
parent da7f66890d
commit 5b90223717
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,10 +12,9 @@ fn push(cpu: &mut Core, bus: &mut SysBus, r: usize) {
bus.write_32(stack_addr, cpu.get_reg(r)) bus.write_32(stack_addr, cpu.get_reg(r))
} }
fn pop(cpu: &mut Core, bus: &mut SysBus, r: usize) { fn pop(cpu: &mut Core, bus: &mut SysBus, r: usize) {
let stack_addr = cpu.gpr[REG_SP] & !3; let val = bus.read_32(cpu.gpr[REG_SP] & !3);
let val = cpu.ldr_word(stack_addr, bus);
cpu.set_reg(r, val); cpu.set_reg(r, val);
cpu.gpr[REG_SP] = stack_addr + 4; cpu.gpr[REG_SP] += 4;
} }
impl Core { impl Core {