Re: [Qemu-devel] [PATCH 08/20] target/arm: Pass in current_el to fp and sve_exception_el

["Alex Bennée" <alex.bennee@linaro.org>]

Richard Henderson <richard.henderson@linaro.org> writes:

> We are going to want to determine whether sve is enabled
> for EL than current.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Are these patches meant to apply to origin/master or on top of the
user-mode fixes? This didn't apply for me:


> @@ -12385,11 +12382,12 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc,
>                            target_ulong *cs_base, uint32_t *pflags)
>  {
>      ARMMMUIdx mmu_idx = core_to_arm_mmu_idx(env, cpu_mmu_index(env, false));
> -    int fp_el = fp_exception_el(env);
> +    int current_el = arm_current_el(env);
> +    int fp_el = fp_exception_el(env, current_el);
>      uint32_t flags;
>
>      if (is_a64(env)) {
> -        int sve_el = sve_exception_el(env);
> +        int sve_el = sve_exception_el(env, current_el);
>          uint32_t zcr_len;
>
>          *pc = env->pc;
> @@ -12404,7 +12402,6 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc,
>          if (sve_el != 0 && fp_el == 0) {
>              zcr_len = 0;
>          } else {
> -            int current_el = arm_current_el(env);
>              ARMCPU *cpu = arm_env_get_cpu(env);
>
>              zcr_len = cpu->sve_max_vq - 1;

++<<<<<<< HEAD
 +            int current_el = arm_current_el(env);
++=======
+             ARMCPU *cpu = arm_env_get_cpu(env);

--
Alex Bennée