Commit a8a79c7a authored by Richard Henderson's avatar Richard Henderson Committed by Peter Maydell
Browse files

target/arm: Rebuild hflags at EL changes 



Begin setting, but not relying upon, env->hflags.

Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20191023150057.25731-17-richard.henderson@linaro.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 14f3c588

linux-user/syscall.c

+1 −0
Original line number Diff line number Diff line
@@ -9984,6 +9984,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, 
                    aarch64_sve_narrow_vq(env, vq);

                }

                env->vfp.zcr_el[1] = vq - 1;

                arm_rebuild_hflags(env);

                ret = vq * 16;

            }

            return ret;

target/arm/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ static void arm_cpu_reset(CPUState *s) 


    hw_breakpoint_update_all(cpu);

    hw_watchpoint_update_all(cpu);

    arm_rebuild_hflags(env);

}



bool arm_cpu_exec_interrupt(CPUState *cs, int interrupt_request)

target/arm/helper-a64.c

+3 −0
Original line number Diff line number Diff line
@@ -1025,6 +1025,7 @@ void HELPER(exception_return)(CPUARMState *env, uint64_t new_pc) 
        } else {

            env->regs[15] = new_pc & ~0x3;

        }

        helper_rebuild_hflags_a32(env, new_el);

        qemu_log_mask(CPU_LOG_INT, "Exception return from AArch64 EL%d to "

                      "AArch32 EL%d PC 0x%" PRIx32 "\n",

                      cur_el, new_el, env->regs[15]);
@@ -1036,10 +1037,12 @@ void HELPER(exception_return)(CPUARMState *env, uint64_t new_pc) 
        }

        aarch64_restore_sp(env, new_el);

        env->pc = new_pc;

        helper_rebuild_hflags_a64(env, new_el);

        qemu_log_mask(CPU_LOG_INT, "Exception return from AArch64 EL%d to "

                      "AArch64 EL%d PC 0x%" PRIx64 "\n",

                      cur_el, new_el, env->pc);

    }



    /*

     * Note that cur_el can never be 0.  If new_el is 0, then

     * el0_a64 is return_to_aa64, else el0_a64 is ignored.

target/arm/helper.c

+2 −0
Original line number Diff line number Diff line
@@ -7998,6 +7998,7 @@ static void take_aarch32_exception(CPUARMState *env, int new_mode, 
        env->regs[14] = env->regs[15] + offset;

    }

    env->regs[15] = newpc;

    arm_rebuild_hflags(env);

}



static void arm_cpu_do_interrupt_aarch32_hyp(CPUState *cs)
@@ -8345,6 +8346,7 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs) 
    pstate_write(env, PSTATE_DAIF | new_mode);

    env->aarch64 = 1;

    aarch64_restore_sp(env, new_el);

    helper_rebuild_hflags_a64(env, new_el);



    env->pc = addr;

target/arm/machine.c

+1 −0
Original line number Diff line number Diff line
@@ -756,6 +756,7 @@ static int cpu_post_load(void *opaque, int version_id) 
    if (!kvm_enabled()) {

        pmu_op_finish(&cpu->env);

    }

    arm_rebuild_hflags(&cpu->env);



    return 0;

}