yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-23 06:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Set FSR for BKPT, BRK when raising exception

Browse source 
Now that we have a helper function specifically for the BRK and
BKPT instructions, we can set the exception.fsr there rather
than in arm_cpu_do_interrupt_aarch32(). This allows us to
use our new arm_debug_exception_fsr() helper.

In particular this fixes a bug where we were hardcoding the
short-form IFSR value, which is wrong if the target exception
level has LPAE enabled.

Fixes: https://bugs.launchpad.net/qemu/+bug/1756927

Backports commit 62b94f31d0df75187bb00684fc29e8639eacc0c5 from qemu
This commit is contained in:
Peter Maydell 2018-03-25 16:36:49 -04:00 committed by Lioncash
parent 16c0c2d253
commit d6eafe5982
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qemu/target/arm/helper.c
View file

@ -7162,7 +7162,6 @@ static void arm_cpu_do_interrupt_aarch32_(CPUState *cs)
offset = 0;
break;
case EXCP_BKPT:
env->exception.fsr = 2;
/* Fall through to prefetch abort. */
case EXCP_PREFETCH_ABORT:
A32_BANKED_CURRENT_REG_SET(env, ifsr, env->exception.fsr);

2
qemu/target/arm/op_helper.c
View file

@ -494,6 +494,8 @@ void HELPER(exception_with_syndrome)(CPUARMState *env, uint32_t excp,
*/
void HELPER(exception_bkpt_insn)(CPUARMState *env, uint32_t syndrome)
{
/* FSR will only be used if the debug target EL is AArch32. */
env->exception.fsr = arm_debug_exception_fsr(env);
raise_exception(env, EXCP_BKPT, syndrome, arm_debug_target_el(env));
}