[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/25] target/arm: Move regime_using_lpae_format into internal.h
From: |
Peter Maydell |
Subject: |
[PULL 09/25] target/arm: Move regime_using_lpae_format into internal.h |
Date: |
Mon, 27 Feb 2023 14:00:46 +0000 |
From: Fabiano Rosas <farosas@suse.de>
This function is needed by common code (ptw.c), so move it along with
the other regime_* functions in internal.h. When we enable the build
without TCG, the tlb_helper.c file will not be present.
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/internals.h | 21 ++++++++++++++++++---
target/arm/tcg/tlb_helper.c | 18 ------------------
2 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/target/arm/internals.h b/target/arm/internals.h
index ed48f8c9a69..680c5747170 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -600,9 +600,6 @@ int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx);
/* Return the MMU index for a v7M CPU in the specified security state */
ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate);
-/* Return true if the translation regime is using LPAE format page tables */
-bool regime_using_lpae_format(CPUARMState *env, ARMMMUIdx mmu_idx);
-
/*
* Return true if the stage 1 translation regime is using LPAE
* format page tables
@@ -767,6 +764,24 @@ static inline uint64_t regime_tcr(CPUARMState *env,
ARMMMUIdx mmu_idx)
return env->cp15.tcr_el[regime_el(env, mmu_idx)];
}
+/* Return true if the translation regime is using LPAE format page tables */
+static inline bool regime_using_lpae_format(CPUARMState *env, ARMMMUIdx
mmu_idx)
+{
+ int el = regime_el(env, mmu_idx);
+ if (el == 2 || arm_el_is_aa64(env, el)) {
+ return true;
+ }
+ if (arm_feature(env, ARM_FEATURE_PMSA) &&
+ arm_feature(env, ARM_FEATURE_V8)) {
+ return true;
+ }
+ if (arm_feature(env, ARM_FEATURE_LPAE)
+ && (regime_tcr(env, mmu_idx) & TTBCR_EAE)) {
+ return true;
+ }
+ return false;
+}
+
/**
* arm_num_brps: Return number of implemented breakpoints.
* Note that the ID register BRPS field is "number of bps - 1",
diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c
index 60abcbebe64..31eb77f7df9 100644
--- a/target/arm/tcg/tlb_helper.c
+++ b/target/arm/tcg/tlb_helper.c
@@ -12,24 +12,6 @@
#include "exec/helper-proto.h"
-/* Return true if the translation regime is using LPAE format page tables */
-bool regime_using_lpae_format(CPUARMState *env, ARMMMUIdx mmu_idx)
-{
- int el = regime_el(env, mmu_idx);
- if (el == 2 || arm_el_is_aa64(env, el)) {
- return true;
- }
- if (arm_feature(env, ARM_FEATURE_PMSA) &&
- arm_feature(env, ARM_FEATURE_V8)) {
- return true;
- }
- if (arm_feature(env, ARM_FEATURE_LPAE)
- && (regime_tcr(env, mmu_idx) & TTBCR_EAE)) {
- return true;
- }
- return false;
-}
-
/*
* Returns true if the stage 1 translation regime is using LPAE format page
* tables. Used when raising alignment exceptions, whose FSR changes depending
--
2.34.1
- [PULL 00/25] target-arm queue, Peter Maydell, 2023/02/27
- [PULL 01/25] include/hw/arm/allwinner-a10.h: Remove superfluous includes from the header, Peter Maydell, 2023/02/27
- [PULL 02/25] target/arm: Wrap breakpoint/watchpoint updates with tcg_enabled, Peter Maydell, 2023/02/27
- [PULL 05/25] target/arm: move helpers to tcg/, Peter Maydell, 2023/02/27
- [PULL 08/25] target/arm: Move hflags code into the tcg directory, Peter Maydell, 2023/02/27
- [PULL 14/25] hw/char/pl011: Un-inline pl011_create(), Peter Maydell, 2023/02/27
- [PULL 17/25] hw/char/xilinx_uartlite: Open-code xilinx_uartlite_create(), Peter Maydell, 2023/02/27
- [PULL 21/25] hw/arm/musicpal: Remove unused dummy MemoryRegion, Peter Maydell, 2023/02/27
- [PULL 25/25] hw: Replace qemu_or_irq typedef by OrIRQState, Peter Maydell, 2023/02/27
- [PULL 09/25] target/arm: Move regime_using_lpae_format into internal.h,
Peter Maydell <=
- [PULL 15/25] hw/char/pl011: Open-code pl011_luminary_create(), Peter Maydell, 2023/02/27
- [PULL 07/25] target/arm: Wrap arm_rebuild_hflags calls with tcg_enabled, Peter Maydell, 2023/02/27
- [PULL 10/25] target/arm: Don't access TCG code when debugging with KVM, Peter Maydell, 2023/02/27
- [PULL 12/25] tests/avocado: add machine:none tag to version.py, Peter Maydell, 2023/02/27
- [PULL 03/25] target/arm: Wrap TCG-only code in debug_helper.c, Peter Maydell, 2023/02/27
- [PULL 16/25] hw/char/xilinx_uartlite: Expose XILINX_UARTLITE QOM type, Peter Maydell, 2023/02/27
- [PULL 20/25] hw/intc/armv7m_nvic: Use QOM cast CPU() macro, Peter Maydell, 2023/02/27
- [PULL 22/25] iothread: Remove unused IOThreadClass / IOTHREAD_CLASS, Peter Maydell, 2023/02/27
- [PULL 23/25] hw/irq: Declare QOM macros using OBJECT_DECLARE_SIMPLE_TYPE(), Peter Maydell, 2023/02/27
- [PULL 06/25] target/arm: Move psci.c into the tcg directory, Peter Maydell, 2023/02/27