diff --git a/qemu/target/arm/helper.c b/qemu/target/arm/helper.c index fe834282..0acbb539 100644 --- a/qemu/target/arm/helper.c +++ b/qemu/target/arm/helper.c @@ -9620,15 +9620,6 @@ static inline uint64_t regime_ttbr(CPUARMState *env, ARMMMUIdx mmu_idx, #endif /* !CONFIG_USER_ONLY */ -/* Return the TCR controlling this translation regime */ -static inline TCR *regime_tcr(CPUARMState *env, ARMMMUIdx mmu_idx) -{ - if (mmu_idx == ARMMMUIdx_Stage2) { - return &env->cp15.vtcr_el2; - } - return &env->cp15.tcr_el[regime_el(env, mmu_idx)]; -} - /* * Convert a possible stage1+2 MMU index into the appropriate * stage 1 MMU index diff --git a/qemu/target/arm/internals.h b/qemu/target/arm/internals.h index 3d5516a8..8686c4cb 100644 --- a/qemu/target/arm/internals.h +++ b/qemu/target/arm/internals.h @@ -950,6 +950,15 @@ static inline uint32_t regime_el(CPUARMState *env, ARMMMUIdx mmu_idx) } } +/* Return the TCR controlling this translation regime */ +static inline TCR *regime_tcr(CPUARMState *env, ARMMMUIdx mmu_idx) +{ + if (mmu_idx == ARMMMUIdx_Stage2) { + return &env->cp15.vtcr_el2; + } + return &env->cp15.tcr_el[regime_el(env, mmu_idx)]; +} + /* Return the FSR value for a debug exception (watchpoint, hardware * breakpoint or BKPT insn) targeting the specified exception level. */