| Message ID | 20191011155546.14342-17-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | target/arm: Reduce overhead of cpu_get_tb_cpu_state | expand |
Richard Henderson <richard.henderson@linaro.org> writes: > Begin setting, but not relying upon, env->hflags. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > linux-user/syscall.c | 1 + > target/arm/cpu.c | 1 + > target/arm/helper-a64.c | 3 +++ > target/arm/helper.c | 2 ++ > target/arm/machine.c | 1 + > target/arm/op_helper.c | 1 + > 6 files changed, 9 insertions(+) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index e2af3c1494..ebefd05140 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -9982,6 +9982,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; > diff --git a/target/arm/cpu.c b/target/arm/cpu.c > index 2399c14471..d043e75166 100644 > --- a/target/arm/cpu.c > +++ b/target/arm/cpu.c > @@ -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) > diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c > index bca80bdc38..b4cd680fc4 100644 > --- a/target/arm/helper-a64.c > +++ b/target/arm/helper-a64.c > @@ -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. > diff --git a/target/arm/helper.c b/target/arm/helper.c > index b2d701cf00..aae7b62458 100644 > --- a/target/arm/helper.c > +++ b/target/arm/helper.c > @@ -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; > > diff --git a/target/arm/machine.c b/target/arm/machine.c > index 5c36707a7c..eb28b2381b 100644 > --- a/target/arm/machine.c > +++ b/target/arm/machine.c > @@ -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; > } > diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c > index 0fd4bd0238..ccc2cecb46 100644 > --- a/target/arm/op_helper.c > +++ b/target/arm/op_helper.c > @@ -404,6 +404,7 @@ void HELPER(cpsr_write_eret)(CPUARMState *env, uint32_t val) > * state. Do the masking now. > */ > env->regs[15] &= (env->thumb ? ~1 : ~3); > + arm_rebuild_hflags(env); > > qemu_mutex_lock_iothread(); > arm_call_el_change_hook(env_archcpu(env)); -- Alex Bennée
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index e2af3c1494..ebefd05140 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -9982,6 +9982,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; diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 2399c14471..d043e75166 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -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) diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index bca80bdc38..b4cd680fc4 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -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. diff --git a/target/arm/helper.c b/target/arm/helper.c index b2d701cf00..aae7b62458 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -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; diff --git a/target/arm/machine.c b/target/arm/machine.c index 5c36707a7c..eb28b2381b 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -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; } diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index 0fd4bd0238..ccc2cecb46 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -404,6 +404,7 @@ void HELPER(cpsr_write_eret)(CPUARMState *env, uint32_t val) * state. Do the masking now. */ env->regs[15] &= (env->thumb ? ~1 : ~3); + arm_rebuild_hflags(env); qemu_mutex_lock_iothread(); arm_call_el_change_hook(env_archcpu(env));
Begin setting, but not relying upon, env->hflags. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- linux-user/syscall.c | 1 + target/arm/cpu.c | 1 + target/arm/helper-a64.c | 3 +++ target/arm/helper.c | 2 ++ target/arm/machine.c | 1 + target/arm/op_helper.c | 1 + 6 files changed, 9 insertions(+) -- 2.17.1