motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 16:53:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/arm: Fold regime_tcr() and regime_tcr_value() together

Browse source 
The only caller of regime_tcr() is now regime_tcr_value(); fold the
two together, and use the shorter and more natural 'regime_tcr'
name for the new function.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220714132303.1287193-4-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2022-07-14 14:22:59 +01:00
parent 9e70e26c53
commit c1547bba7e
4 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
target/arm/internals.h
View file

@ -777,26 +777,20 @@ static inline uint64_t regime_sctlr(CPUARMState *env, ARMMMUIdx mmu_idx)
return env->cp15.sctlr_el[regime_el(env, mmu_idx)];
}
/* Return the TCR controlling this translation regime */
static inline TCR *regime_tcr(CPUARMState *env, ARMMMUIdx mmu_idx)
/* Return the value of the TCR controlling this translation regime */
static inline uint64_t regime_tcr(CPUARMState *env, ARMMMUIdx mmu_idx)
{
if (mmu_idx == ARMMMUIdx_Stage2) {
return &env->cp15.vtcr_el2;
return env->cp15.vtcr_el2.raw_tcr;
}
if (mmu_idx == ARMMMUIdx_Stage2_S) {
/*
* Note: Secure stage 2 nominally shares fields from VTCR_EL2, but
* those are not currently used by QEMU, so just return VSTCR_EL2.
*/
return &env->cp15.vstcr_el2;
return env->cp15.vstcr_el2.raw_tcr;
}
return &env->cp15.tcr_el[regime_el(env, mmu_idx)];
}
/* Return the raw value of the TCR controlling this translation regime */
static inline uint64_t regime_tcr_value(CPUARMState *env, ARMMMUIdx mmu_idx)
{
return regime_tcr(env, mmu_idx)->raw_tcr;
return env->cp15.tcr_el[regime_el(env, mmu_idx)].raw_tcr;
}
/**