Re: [PATCH 14/14] target/arm: Correct errors in WFI/WFE trapping

[Richard Henderson]

On 1/30/25 10:23, Peter Maydell wrote:

The code for WFI/WFE trapping has several errors:
  * it wasn't using arm_sctlr(), so it would look at SCTLR_EL1
    even if the CPU was in the EL2&0 translation regime
  * it was raising UNDEF, not Monitor Trap, for traps to
    AArch32 EL3 because of SCR.{TWE,TWI}
  * it was not honouring SCR.{TWE,TWI} when running in
    AArch32 at EL3 not in Monitor mode
  * it checked SCR.{TWE,TWI} even on v7 CPUs which don't have
    those bits

Fix these bugs.

Cc:qemu-sta...@nongnu.org
Fixes: b1eced713d99 ("target-arm: Add WFx instruction trap support")
Signed-off-by: Peter Maydell<peter.mayd...@linaro.org>
---
  target/arm/tcg/op_helper.c | 37 ++++++++++++++++++-------------------
  1 file changed, 18 insertions(+), 19 deletions(-)

Reviewed-by: Richard Henderson <richard.hender...@linaro.org>


r~