[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/33] target/arm: Move v7m_using_psp() to internals.
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 22/33] target/arm: Move v7m_using_psp() to internals.h |
Date: |
Mon, 8 Oct 2018 14:59:53 +0100 |
We're going to want v7m_using_psp() in op_helper.c in the
next patch, so move it from helper.c to internals.h.
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-id: address@hidden
---
target/arm/internals.h | 16 ++++++++++++++++
target/arm/helper.c | 12 ------------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/target/arm/internals.h b/target/arm/internals.h
index 24c0444c8d2..2495681435d 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -801,4 +801,20 @@ static inline uint32_t arm_debug_exception_fsr(CPUARMState
*env)
*/
#define MEMOPIDX_SHIFT 8
+/**
+ * v7m_using_psp: Return true if using process stack pointer
+ * Return true if the CPU is currently using the process stack
+ * pointer, or false if it is using the main stack pointer.
+ */
+static inline bool v7m_using_psp(CPUARMState *env)
+{
+ /* Handler mode always uses the main stack; for thread mode
+ * the CONTROL.SPSEL bit determines the answer.
+ * Note that in v7M it is not possible to be in Handler mode with
+ * CONTROL.SPSEL non-zero, but in v8M it is, so we must check both.
+ */
+ return !arm_v7m_is_handler_mode(env) &&
+ env->v7m.control[env->v7m.secure] & R_V7M_CONTROL_SPSEL_MASK;
+}
+
#endif
diff --git a/target/arm/helper.c b/target/arm/helper.c
index a9a2173cb2f..7ffd1840447 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -6582,18 +6582,6 @@ pend_fault:
return false;
}
-/* Return true if we're using the process stack pointer (not the MSP) */
-static bool v7m_using_psp(CPUARMState *env)
-{
- /* Handler mode always uses the main stack; for thread mode
- * the CONTROL.SPSEL bit determines the answer.
- * Note that in v7M it is not possible to be in Handler mode with
- * CONTROL.SPSEL non-zero, but in v8M it is, so we must check both.
- */
- return !arm_v7m_is_handler_mode(env) &&
- env->v7m.control[env->v7m.secure] & R_V7M_CONTROL_SPSEL_MASK;
-}
-
/* Write to v7M CONTROL.SPSEL bit for the specified security bank.
* This may change the current stack pointer between Main and Process
* stack pointers if it is done for the CONTROL register for the current
--
2.19.0
- [Qemu-devel] [PULL 15/33] target/arm: Split contiguous stores for endianness, (continued)
- [Qemu-devel] [PULL 15/33] target/arm: Split contiguous stores for endianness, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 11/33] target/arm: Rewrite helper_sve_ld1*_r using pages, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 12/33] target/arm: Rewrite helper_sve_ld[234]*_r, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 14/33] target/arm: Split contiguous loads for endianness, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 16/33] target/arm: Rewrite vector gather loads, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 21/33] target/arm: Define new EXCP type for v8M stack overflows, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 20/33] target/arm: Define new TBFLAG for v8M stack checking, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 19/33] target/arm: Pass TCGMemOpIdx to sve memory helpers, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 17/33] target/arm: Rewrite vector gather stores, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 18/33] target/arm: Rewrite vector gather first-fault loads, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 22/33] target/arm: Move v7m_using_psp() to internals.h,
Peter Maydell <=
- [Qemu-devel] [PULL 10/33] target/arm: Clear unused predicate bits for LD1RQ, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 09/33] target/arm: Adjust aarch64_cpu_dump_state for system mode SVE, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 23/33] target/arm: Add v8M stack checks on ADD/SUB/MOV of SP, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 08/33] target/arm: Handle SVE vector length changes in system mode, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 13/33] target/arm: Rewrite helper_sve_st[1234]*_r, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 32/33] target/arm: Add v8M stack checks for MSR to SP_NS, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 33/33] hw/display/bcm2835_fb: Silence Coverity warning about multiply overflow, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 31/33] target/arm: Add v8M stack checks for VLDM/VSTM, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 29/33] target/arm: Add v8M stack checks for T32 load/store single, Peter Maydell, 2018/10/08
- [Qemu-devel] [PULL 30/33] target/arm: Add v8M stack checks for Thumb push/pop, Peter Maydell, 2018/10/08