mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-27 21:40:49 +00:00
target-arm: Correct "preferred return address" for cpreg access exceptions
The architecture defines that when taking an exception trying to access a coprocessor register, the "preferred return address" for the exception is the address of the instruction that caused the exception. Correct an off-by-4 error which meant we were returning the address after the instruction for traps which happened because of a failure of a runtime access-check function on an AArch32 register. (Traps caused by translate-time checkable permissions failures had the correct address, as did traps on AArch64 registers.) This fixes https://bugs.launchpad.net/qemu/+bug/1463338 Reported-by: Robert Buhren <robert@robertbuhren.de> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1433861440-30133-1-git-send-email-peter.maydell@linaro.org
This commit is contained in:
parent
63a183ed0e
commit
3977ee5d7a
@ -7175,7 +7175,7 @@ static int disas_coproc_insn(DisasContext *s, uint32_t insn)
|
||||
break;
|
||||
}
|
||||
|
||||
gen_set_pc_im(s, s->pc);
|
||||
gen_set_pc_im(s, s->pc - 4);
|
||||
tmpptr = tcg_const_ptr(ri);
|
||||
tcg_syn = tcg_const_i32(syndrome);
|
||||
gen_helper_access_check_cp_reg(cpu_env, tmpptr, tcg_syn);
|
||||
|
Loading…
Reference in New Issue
Block a user