openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target/arm: Hoist store to flags output in cpu_get_tb_cpu_state 

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20180119045438.28582-15-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2018-01-25 11:45:29 +00:00 committed by Peter Maydell
parent a9e013112f
commit b9adaa70a0
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
target/arm/helper.c
View File

@ -11688,34 +11688,36 @@ static inline int fp_exception_el(CPUARMState *env)
} }
void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc,
target_ulong *cs_base, uint32_t *flags) target_ulong *cs_base, uint32_t *pflags)
{ {
ARMMMUIdx mmu_idx = core_to_arm_mmu_idx(env, cpu_mmu_index(env, false)); ARMMMUIdx mmu_idx = core_to_arm_mmu_idx(env, cpu_mmu_index(env, false));
uint32_t flags;
if (is_a64(env)) { if (is_a64(env)) {
*pc = env->pc; *pc = env->pc;
*flags = ARM_TBFLAG_AARCH64_STATE_MASK; flags = ARM_TBFLAG_AARCH64_STATE_MASK;
/* Get control bits for tagged addresses */ /* Get control bits for tagged addresses */
*flags |= (arm_regime_tbi0(env, mmu_idx) << ARM_TBFLAG_TBI0_SHIFT); flags |= (arm_regime_tbi0(env, mmu_idx) << ARM_TBFLAG_TBI0_SHIFT);
*flags |= (arm_regime_tbi1(env, mmu_idx) << ARM_TBFLAG_TBI1_SHIFT); flags |= (arm_regime_tbi1(env, mmu_idx) << ARM_TBFLAG_TBI1_SHIFT);
} else { } else {
*pc = env->regs[15]; *pc = env->regs[15];
*flags = (env->thumb << ARM_TBFLAG_THUMB_SHIFT) flags = (env->thumb << ARM_TBFLAG_THUMB_SHIFT)
| (env->vfp.vec_len << ARM_TBFLAG_VECLEN_SHIFT) | (env->vfp.vec_len << ARM_TBFLAG_VECLEN_SHIFT)
| (env->vfp.vec_stride << ARM_TBFLAG_VECSTRIDE_SHIFT) | (env->vfp.vec_stride << ARM_TBFLAG_VECSTRIDE_SHIFT)
| (env->condexec_bits << ARM_TBFLAG_CONDEXEC_SHIFT) | (env->condexec_bits << ARM_TBFLAG_CONDEXEC_SHIFT)
| (arm_sctlr_b(env) << ARM_TBFLAG_SCTLR_B_SHIFT); | (arm_sctlr_b(env) << ARM_TBFLAG_SCTLR_B_SHIFT);
if (!(access_secure_reg(env))) { if (!(access_secure_reg(env))) {
*flags |= ARM_TBFLAG_NS_MASK; flags |= ARM_TBFLAG_NS_MASK;
} }
if (env->vfp.xregs[ARM_VFP_FPEXC] & (1 << 30) if (env->vfp.xregs[ARM_VFP_FPEXC] & (1 << 30)
|| arm_el_is_aa64(env, 1)) { || arm_el_is_aa64(env, 1)) {
*flags |= ARM_TBFLAG_VFPEN_MASK; flags |= ARM_TBFLAG_VFPEN_MASK;
} }
*flags |= (extract32(env->cp15.c15_cpar, 0, 2) flags |= (extract32(env->cp15.c15_cpar, 0, 2)
<< ARM_TBFLAG_XSCALE_CPAR_SHIFT); << ARM_TBFLAG_XSCALE_CPAR_SHIFT);
} }
*flags |= (arm_to_core_mmu_idx(mmu_idx) << ARM_TBFLAG_MMUIDX_SHIFT); flags |= (arm_to_core_mmu_idx(mmu_idx) << ARM_TBFLAG_MMUIDX_SHIFT);
/* The SS_ACTIVE and PSTATE_SS bits correspond to the state machine /* The SS_ACTIVE and PSTATE_SS bits correspond to the state machine
* states defined in the ARM ARM for software singlestep: * states defined in the ARM ARM for software singlestep:
@ -11725,25 +11727,26 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc,
* 1 1 Active-not-pending * 1 1 Active-not-pending
*/ */
if (arm_singlestep_active(env)) { if (arm_singlestep_active(env)) {
*flags |= ARM_TBFLAG_SS_ACTIVE_MASK; flags |= ARM_TBFLAG_SS_ACTIVE_MASK;
if (is_a64(env)) { if (is_a64(env)) {
if (env->pstate & PSTATE_SS) { if (env->pstate & PSTATE_SS) {
*flags |= ARM_TBFLAG_PSTATE_SS_MASK; flags |= ARM_TBFLAG_PSTATE_SS_MASK;
} }
} else { } else {
if (env->uncached_cpsr & PSTATE_SS) { if (env->uncached_cpsr & PSTATE_SS) {
*flags |= ARM_TBFLAG_PSTATE_SS_MASK; flags |= ARM_TBFLAG_PSTATE_SS_MASK;
} }
} }
} }
if (arm_cpu_data_is_big_endian(env)) { if (arm_cpu_data_is_big_endian(env)) {
*flags |= ARM_TBFLAG_BE_DATA_MASK; flags |= ARM_TBFLAG_BE_DATA_MASK;
} }
*flags |= fp_exception_el(env) << ARM_TBFLAG_FPEXC_EL_SHIFT; flags |= fp_exception_el(env) << ARM_TBFLAG_FPEXC_EL_SHIFT;
if (arm_v7m_is_handler_mode(env)) { if (arm_v7m_is_handler_mode(env)) {
*flags |= ARM_TBFLAG_HANDLER_MASK; flags |= ARM_TBFLAG_HANDLER_MASK;
} }
*pflags = flags;
*cs_base = 0; *cs_base = 0;
} }