public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

target/arm: Fix syndrome for FGT traps on ERET

Browse source 
In commit 442c9d682c when we converted the ERET, ERETAA, ERETAB
instructions to decodetree, the conversion accidentally lost the
correct setting of the syndrome register when taking a trap because
of the FEAT_FGT HFGITR_EL1.ERET bit.  Instead of reporting a correct
full syndrome value with the EC and IL bits, we only reported the low
two bits of the syndrome, because the call to syn_erettrap() got
dropped.

Fix the syndrome values for these traps by reinstating the
syn_erettrap() calls.

Fixes: 442c9d682c ("target/arm: Convert ERET, ERETAA, ERETAB to decodetree")
Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20231024172438.2990945-1-peter.maydell@linaro.org
(cherry picked from commit 307521d6e29e559c89afa9dbd337ae75fe3c436d)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Peter Maydell 2023-10-24 18:24:38 +01:00 committed by Michael Tokarev
parent fd4ce7455f
commit 143352cd7d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/arm/tcg/translate-a64.c
View file

@ -1627,7 +1627,7 @@ static bool trans_ERET(DisasContext *s, arg_ERET *a)
return false; return false;
} }
if (s->fgt_eret) { if (s->fgt_eret) {
gen_exception_insn_el(s, 0, EXCP_UDEF, 0, 2); gen_exception_insn_el(s, 0, EXCP_UDEF, syn_erettrap(0), 2);
return true; return true;
} }
dst = tcg_temp_new_i64(); dst = tcg_temp_new_i64();
@ -1654,7 +1654,7 @@ static bool trans_ERETA(DisasContext *s, arg_reta *a)
} }
/* The FGT trap takes precedence over an auth trap. */ /* The FGT trap takes precedence over an auth trap. */
if (s->fgt_eret) { if (s->fgt_eret) {
gen_exception_insn_el(s, 0, EXCP_UDEF, a->m ? 3 : 2, 2); gen_exception_insn_el(s, 0, EXCP_UDEF, syn_erettrap(a->m ? 3 : 2), 2);
return true; return true;
} }
dst = tcg_temp_new_i64(); dst = tcg_temp_new_i64();