yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-08-04 11:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Fill in the WnR syndrome bit in mte_check_fail

Browse source 
According to AArch64.TagCheckFault, none of the other ISS values are
provided, so we do not need to go so far as merge_syn_data_abort.
But we were missing the WnR bit.

Backports commit 9a4670be7f0734d27bf4058db3becf83cd0cc9d5 from qemu
This commit is contained in:
Richard Henderson 2021-02-26 12:26:13 -05:00 committed by Lioncash
parent 6969435fb8
commit 6f341e0199
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
qemu/target/arm/mte_helper.c
View file

@ -495,7 +495,7 @@ static void mte_check_fail(CPUARMState *env, uint32_t desc,
{ {
int mmu_idx = FIELD_EX32(desc, MTEDESC, MIDX); int mmu_idx = FIELD_EX32(desc, MTEDESC, MIDX);
ARMMMUIdx arm_mmu_idx = core_to_aa64_mmu_idx(mmu_idx); ARMMMUIdx arm_mmu_idx = core_to_aa64_mmu_idx(mmu_idx);
int el, reg_el, tcf, select; int el, reg_el, tcf, select, is_write, syn;
uint64_t sctlr; uint64_t sctlr;
reg_el = regime_el(env, arm_mmu_idx); reg_el = regime_el(env, arm_mmu_idx);
@ -523,9 +523,9 @@ static void mte_check_fail(CPUARMState *env, uint32_t desc,
*/ */
cpu_restore_state(env_cpu(env), ra, true); cpu_restore_state(env_cpu(env), ra, true);
env->exception.vaddress = dirty_ptr; env->exception.vaddress = dirty_ptr;
raise_exception(env, EXCP_DATA_ABORT, is_write = FIELD_EX32(desc, MTEDESC, WRITE);
syn_data_abort_no_iss(el != 0, 0, 0, 0, 0, 0, 0x11), syn = syn_data_abort_no_iss(el != 0, 0, 0, 0, 0, is_write, 0x11);
exception_target_el(env)); raise_exception(env, EXCP_DATA_ABORT, syn, exception_target_el(env));
/* noreturn, but fall through to the assert anyway */ /* noreturn, but fall through to the assert anyway */
case 0: case 0: