From: Oleg Vasilev <vasilev.o...@huawei.com>
Now it is available for other files to use.
CC: qemu-...@nongnu.org
Signed-off-by: Oleg Vasilev <vasilev.o...@huawei.com>
Signed-off-by: Oleg Vasilev <m...@svin.in>
---
target/arm/helper.c | 17 -----------------
target/arm/internals.h | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index db837d53bd..747c94fd95 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -10275,23 +10275,6 @@ static inline bool
regime_translation_big_endian(CPUARMState *env,
return (regime_sctlr(env, mmu_idx) & SCTLR_EE) != 0;
}
-/* Return the TTBR associated with this translation regime */
-static inline uint64_t regime_ttbr(CPUARMState *env, ARMMMUIdx mmu_idx,
- int ttbrn)
-{
- if (mmu_idx == ARMMMUIdx_Stage2) {
- return env->cp15.vttbr_el2;
- }
- if (mmu_idx == ARMMMUIdx_Stage2_S) {
- return env->cp15.vsttbr_el2;
- }
- if (ttbrn == 0) {
- return env->cp15.ttbr0_el[regime_el(env, mmu_idx)];
- } else {
- return env->cp15.ttbr1_el[regime_el(env, mmu_idx)];
- }
-}
-
#endif /* !CONFIG_USER_ONLY */
/* Convert a possible stage1+2 MMU index into the appropriate
diff --git a/target/arm/internals.h b/target/arm/internals.h
index 89f7610ebc..a288fe019b 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -1132,6 +1132,23 @@ bool get_phys_addr(CPUARMState *env, target_ulong
address,
void arm_log_exception(int idx);
+/* Return the TTBR associated with this translation regime */
+static inline uint64_t regime_ttbr(CPUARMState *env, ARMMMUIdx mmu_idx,
+ int ttbrn)
+{
+ if (mmu_idx == ARMMMUIdx_Stage2) {
+ return env->cp15.vttbr_el2;
+ }
+ if (mmu_idx == ARMMMUIdx_Stage2_S) {
+ return env->cp15.vsttbr_el2;
+ }
+ if (ttbrn == 0) {
+ return env->cp15.ttbr0_el[regime_el(env, mmu_idx)];
+ } else {
+ return env->cp15.ttbr1_el[regime_el(env, mmu_idx)];
+ }
+}
+
#endif /* !CONFIG_USER_ONLY */
/*
--
2.33.1
