[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/14] target/arm: Export arm_v7m_mrs_control
From: |
Richard Henderson |
Subject: |
[PATCH 12/14] target/arm: Export arm_v7m_mrs_control |
Date: |
Tue, 14 Feb 2023 06:30:46 -1000 |
From: David Reiss <dreiss@meta.com>
Allow the function to be used outside of m_helper.c.
Rename with an "arm_" prefix.
Signed-off-by: David Reiss <dreiss@meta.com>
[rth: Split out of a larger patch]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/internals.h | 3 +++
target/arm/m_helper.c | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/target/arm/internals.h b/target/arm/internals.h
index 4b60355a7e..127a425961 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -1353,6 +1353,9 @@ void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp);
void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp);
#endif
+/* Read the CONTROL register as the MRS instruction would. */
+uint32_t arm_v7m_mrs_control(CPUARMState *env, uint32_t secure);
+
#ifdef CONFIG_USER_ONLY
static inline void define_cortex_a72_a57_a53_cp_reginfo(ARMCPU *cpu) { }
#else
diff --git a/target/arm/m_helper.c b/target/arm/m_helper.c
index e7e746ea18..c20bcac977 100644
--- a/target/arm/m_helper.c
+++ b/target/arm/m_helper.c
@@ -53,7 +53,7 @@ static uint32_t v7m_mrs_xpsr(CPUARMState *env, uint32_t reg,
unsigned el)
return xpsr_read(env) & mask;
}
-static uint32_t v7m_mrs_control(CPUARMState *env, uint32_t secure)
+uint32_t arm_v7m_mrs_control(CPUARMState *env, uint32_t secure)
{
uint32_t value = env->v7m.control[secure];
@@ -90,7 +90,7 @@ uint32_t HELPER(v7m_mrs)(CPUARMState *env, uint32_t reg)
case 0 ... 7: /* xPSR sub-fields */
return v7m_mrs_xpsr(env, reg, 0);
case 20: /* CONTROL */
- return v7m_mrs_control(env, 0);
+ return arm_v7m_mrs_control(env, 0);
default:
/* Unprivileged reads others as zero. */
return 0;
@@ -2420,7 +2420,7 @@ uint32_t HELPER(v7m_mrs)(CPUARMState *env, uint32_t reg)
case 0 ... 7: /* xPSR sub-fields */
return v7m_mrs_xpsr(env, reg, el);
case 20: /* CONTROL */
- return v7m_mrs_control(env, env->v7m.secure);
+ return arm_v7m_mrs_control(env, env->v7m.secure);
case 0x94: /* CONTROL_NS */
/*
* We have to handle this here because unprivileged Secure code
--
2.34.1
- Re: [PATCH 03/14] target/arm: Move arm_gen_dynamic_svereg_xml to gdbstub64.c, (continued)
- [PATCH 05/14] target/arm: Simplify register counting in arm_gen_dynamic_svereg_xml, Richard Henderson, 2023/02/14
- [PATCH 06/14] target/arm: Hoist pred_width in arm_gen_dynamic_svereg_xml, Richard Henderson, 2023/02/14
- [PATCH 11/14] target/arm: Implement gdbstub pauth extension, Richard Henderson, 2023/02/14
- [PATCH 13/14] target/arm: Export arm_v7m_get_sp_ptr, Richard Henderson, 2023/02/14
- [PATCH 12/14] target/arm: Export arm_v7m_mrs_control,
Richard Henderson <=
- [PATCH 08/14] target/arm: Add name argument to output_vector_union_type, Richard Henderson, 2023/02/14
- [PATCH 09/14] target/arm: Simplify iteration over bit widths, Richard Henderson, 2023/02/14
- [PATCH 14/14] target/arm: Support reading m-profile system registers from gdb, Richard Henderson, 2023/02/14