From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, "David Reiss" <dreiss@meta.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v3 12/14] target/arm: Export arm_v7m_mrs_control
Date: Mon, 27 Feb 2023 11:33:27 -1000 [thread overview]
Message-ID: <20230227213329.793795-13-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230227213329.793795-1-richard.henderson@linaro.org>
From: David Reiss <dreiss@meta.com>
Allow the function to be used outside of m_helper.c.
Rename with an "arm_" prefix.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
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/tcg/m_helper.c | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/target/arm/internals.h b/target/arm/internals.h
index 97271117a4..0f2c48ad4b 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -1355,6 +1355,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/tcg/m_helper.c b/target/arm/tcg/m_helper.c
index f94e87e728..03be79e7bf 100644
--- a/target/arm/tcg/m_helper.c
+++ b/target/arm/tcg/m_helper.c
@@ -56,7 +56,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];
@@ -93,7 +93,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;
@@ -2465,7 +2465,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
next prev parent reply other threads:[~2023-02-27 21:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 21:33 [PATCH v3 00/14] target/arm: gdbstub cleanups and additions Richard Henderson
2023-02-27 21:33 ` [PATCH v3 01/14] target/arm: Normalize aarch64 gdbstub get/set function names Richard Henderson
2023-02-27 21:33 ` [PATCH v3 02/14] target/arm: Unexport arm_gen_dynamic_sysreg_xml Richard Henderson
2023-02-27 21:33 ` [PATCH v3 03/14] target/arm: Move arm_gen_dynamic_svereg_xml to gdbstub64.c Richard Henderson
2023-02-27 21:33 ` [PATCH v3 04/14] target/arm: Split out output_vector_union_type Richard Henderson
2023-02-27 21:33 ` [PATCH v3 05/14] target/arm: Simplify register counting in arm_gen_dynamic_svereg_xml Richard Henderson
2023-02-27 21:33 ` [PATCH v3 06/14] target/arm: Hoist pred_width " Richard Henderson
2023-02-27 21:33 ` [PATCH v3 07/14] target/arm: Fix svep width " Richard Henderson
2023-02-27 21:33 ` [PATCH v3 08/14] target/arm: Add name argument to output_vector_union_type Richard Henderson
2023-02-27 21:33 ` [PATCH v3 09/14] target/arm: Simplify iteration over bit widths Richard Henderson
2023-02-27 21:33 ` [PATCH v3 10/14] target/arm: Create pauth_ptr_mask Richard Henderson
2023-02-27 21:33 ` [PATCH v3 11/14] target/arm: Implement gdbstub pauth extension Richard Henderson
2023-02-27 21:33 ` Richard Henderson [this message]
2023-02-27 21:33 ` [PATCH v3 13/14] target/arm: Export arm_v7m_get_sp_ptr Richard Henderson
2023-02-27 21:33 ` [PATCH v3 14/14] target/arm: Implement gdbstub m-profile systemreg and secext Richard Henderson
2023-03-03 14:03 ` [PATCH v3 00/14] target/arm: gdbstub cleanups and additions Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230227213329.793795-13-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=dreiss@meta.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).