| Message ID | 20191011155546.14342-9-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: > Create a function to compute the values of the TBFLAG_ANY bits > that will be cached, and are used by A-profile. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > target/arm/helper.c | 20 ++++++++++++-------- > 1 file changed, 12 insertions(+), 8 deletions(-) > > diff --git a/target/arm/helper.c b/target/arm/helper.c > index d1cd54cc93..ddd21edfcf 100644 > --- a/target/arm/helper.c > +++ b/target/arm/helper.c > @@ -11106,18 +11106,28 @@ static uint32_t rebuild_hflags_m32(CPUARMState *env, int fp_el, > return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); > } > > +static uint32_t rebuild_hflags_aprofile(CPUARMState *env) > +{ > + int flags = 0; > + > + flags = FIELD_DP32(flags, TBFLAG_ANY, DEBUG_TARGET_EL, > + arm_debug_target_el(env)); > + return flags; > +} > + > static uint32_t rebuild_hflags_a32(CPUARMState *env, int fp_el, > ARMMMUIdx mmu_idx) > { > - return rebuild_hflags_common_32(env, fp_el, mmu_idx, 0); > + uint32_t flags = rebuild_hflags_aprofile(env); > + return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); > } > > static uint32_t rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, > ARMMMUIdx mmu_idx) > { > + uint32_t flags = rebuild_hflags_aprofile(env); > ARMMMUIdx stage1 = stage_1_mmu_idx(mmu_idx); > ARMVAParameters p0 = aa64_va_parameters_both(env, 0, stage1); > - uint32_t flags = 0; > uint64_t sctlr; > int tbii, tbid; > > @@ -11262,12 +11272,6 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, > } > } > > - if (!arm_feature(env, ARM_FEATURE_M)) { > - int target_el = arm_debug_target_el(env); > - > - flags = FIELD_DP32(flags, TBFLAG_ANY, DEBUG_TARGET_EL, target_el); > - } > - > *pflags = flags; > *cs_base = 0; > } -- Alex Bennée
diff --git a/target/arm/helper.c b/target/arm/helper.c index d1cd54cc93..ddd21edfcf 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11106,18 +11106,28 @@ static uint32_t rebuild_hflags_m32(CPUARMState *env, int fp_el, return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); } +static uint32_t rebuild_hflags_aprofile(CPUARMState *env) +{ + int flags = 0; + + flags = FIELD_DP32(flags, TBFLAG_ANY, DEBUG_TARGET_EL, + arm_debug_target_el(env)); + return flags; +} + static uint32_t rebuild_hflags_a32(CPUARMState *env, int fp_el, ARMMMUIdx mmu_idx) { - return rebuild_hflags_common_32(env, fp_el, mmu_idx, 0); + uint32_t flags = rebuild_hflags_aprofile(env); + return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); } static uint32_t rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, ARMMMUIdx mmu_idx) { + uint32_t flags = rebuild_hflags_aprofile(env); ARMMMUIdx stage1 = stage_1_mmu_idx(mmu_idx); ARMVAParameters p0 = aa64_va_parameters_both(env, 0, stage1); - uint32_t flags = 0; uint64_t sctlr; int tbii, tbid; @@ -11262,12 +11272,6 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, } } - if (!arm_feature(env, ARM_FEATURE_M)) { - int target_el = arm_debug_target_el(env); - - flags = FIELD_DP32(flags, TBFLAG_ANY, DEBUG_TARGET_EL, target_el); - } - *pflags = flags; *cs_base = 0; }
Create a function to compute the values of the TBFLAG_ANY bits that will be cached, and are used by A-profile. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/arm/helper.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) -- 2.17.1