ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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.

Tested-by: Andrey Konovalov <andreyknvl@google.com>
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20200813200816.3037186-3-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2020-08-28 10:02:45 +01:00 committed by Peter Maydell
parent dbf8c32178
commit 9a4670be7f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/arm/mte_helper.c
View File

@ -519,7 +519,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);
@ -547,9 +547,10 @@ 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,
syn_data_abort_no_iss(el != 0, 0, 0, 0, 0, 0, 0x11), is_write = FIELD_EX32(desc, MTEDESC, WRITE);
exception_target_el(env)); syn = syn_data_abort_no_iss(el != 0, 0, 0, 0, 0, is_write, 0x11);
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: