Re: [PATCH 01/28] target/arm: Move stage_1_mmu_idx decl to internals.h

[Philippe Mathieu-Daudé]

On 4/6/22 06:05, Richard Henderson wrote:
> Move the decl from ptw.h to internals.h.  Provide an inline
> version for user-only, just as we do for arm_stage1_mmu_idx.
> Move an endif down to make the definition in helper.c be
> system only.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   target/arm/internals.h | 5 +++++
>   target/arm/helper.c    | 5 ++---
>   2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/target/arm/internals.h b/target/arm/internals.h
> index b654bee468..72b6af5559 100644
> --- a/target/arm/internals.h
> +++ b/target/arm/internals.h
> @@ -979,11 +979,16 @@ ARMMMUIdx arm_mmu_idx(CPUARMState *env);
>    * Return the ARMMMUIdx for the stage1 traversal for the current regime.
>    */
>   #ifdef CONFIG_USER_ONLY
> +static inline ARMMMUIdx stage_1_mmu_idx(ARMMMUIdx mmu_idx)
> +{

Should we assert(mmu_idx == ARMMMUIdx_Stage1_E0)?

> +    return ARMMMUIdx_Stage1_E0;
> +}