target/arm: use raise_exception_ra for MTE check failure
Now that raise_exception_ra restores the state before raising the exception we can use restore_exception_ra to perform the state restore + exception raising without clobbering the syndrome. Cc: Richard Henderson <richard.henderson@linaro.org> Cc: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Jamie Iles <jamie@nuviainc.com> [PMM: Keep the one line of the comment that is still relevant] Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
154acaba0e
commit
5bf100c320
|
@ -563,20 +563,14 @@ static void mte_check_fail(CPUARMState *env, uint32_t desc,
|
||||||
|
|
||||||
switch (tcf) {
|
switch (tcf) {
|
||||||
case 1:
|
case 1:
|
||||||
/*
|
/* Tag check fail causes a synchronous exception. */
|
||||||
* Tag check fail causes a synchronous exception.
|
|
||||||
*
|
|
||||||
* In restore_state_to_opc, we set the exception syndrome
|
|
||||||
* for the load or store operation. Unwind first so we
|
|
||||||
* may overwrite that with the syndrome for the tag check.
|
|
||||||
*/
|
|
||||||
cpu_restore_state(env_cpu(env), ra, true);
|
|
||||||
env->exception.vaddress = dirty_ptr;
|
env->exception.vaddress = dirty_ptr;
|
||||||
|
|
||||||
is_write = FIELD_EX32(desc, MTEDESC, WRITE);
|
is_write = FIELD_EX32(desc, MTEDESC, WRITE);
|
||||||
syn = syn_data_abort_no_iss(arm_current_el(env) != 0, 0, 0, 0, 0,
|
syn = syn_data_abort_no_iss(arm_current_el(env) != 0, 0, 0, 0, 0,
|
||||||
is_write, 0x11);
|
is_write, 0x11);
|
||||||
raise_exception(env, EXCP_DATA_ABORT, syn, exception_target_el(env));
|
raise_exception_ra(env, EXCP_DATA_ABORT, syn,
|
||||||
|
exception_target_el(env), ra);
|
||||||
/* noreturn, but fall through to the assert anyway */
|
/* noreturn, but fall through to the assert anyway */
|
||||||
|
|
||||||
case 0:
|
case 0:
|
||||||
|
|
Loading…
Reference in a new issue