diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-06-08 19:38:48 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-06-08 19:38:48 +0100 |
| commit | d8cca960a9a5dbd216d2331cef3cc72f2c7338e0 (patch) | |
| tree | 16aa79aadf4cc7850f65b18da1d35d187d453648 /target/arm/helper.c | |
| parent | b3f5cc3fda5775b34aa52e111d50c9d10911b352 (diff) | |
| download | qemu-d8cca960a9a5dbd216d2331cef3cc72f2c7338e0.zip qemu-d8cca960a9a5dbd216d2331cef3cc72f2c7338e0.tar.gz qemu-d8cca960a9a5dbd216d2331cef3cc72f2c7338e0.tar.bz2 | |
target/arm: Move stage_1_mmu_idx decl to internals.h
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>
Message-id: 20220604040607.269301-2-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/arm/helper.c')
| -rw-r--r-- | target/arm/helper.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c index 5727ead..829b660 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10517,12 +10517,10 @@ static inline uint64_t regime_ttbr(CPUARMState *env, ARMMMUIdx mmu_idx, } } -#endif /* !CONFIG_USER_ONLY */ - /* Convert a possible stage1+2 MMU index into the appropriate * stage 1 MMU index */ -static inline ARMMMUIdx stage_1_mmu_idx(ARMMMUIdx mmu_idx) +ARMMMUIdx stage_1_mmu_idx(ARMMMUIdx mmu_idx) { switch (mmu_idx) { case ARMMMUIdx_SE10_0: @@ -10541,6 +10539,7 @@ static inline ARMMMUIdx stage_1_mmu_idx(ARMMMUIdx mmu_idx) return mmu_idx; } } +#endif /* !CONFIG_USER_ONLY */ /* Return true if the translation regime is using LPAE format page tables */ static inline bool regime_using_lpae_format(CPUARMState *env, |