From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Sergey Fedorov <serge.fdrv@gmail.com>,
qemu-arm@nongnu.org, qemu-devel@nongnu.org, patches@linaro.org
Subject: Re: [Qemu-devel] [PATCH 2/4] target-arm: Move get/set_r13_banked() to op_helper.c
Date: Fri, 12 Feb 2016 16:05:54 +0100 [thread overview]
Message-ID: <20160212150554.GF31433@toto> (raw)
In-Reply-To: <1455217909-28317-3-git-send-email-peter.maydell@linaro.org>
On Thu, Feb 11, 2016 at 07:11:47PM +0000, Peter Maydell wrote:
> Move get/set_r13_banked() from helper.c to op_helper.c. This will
> let us add exception-raising code to them, and also puts them
> in the same file as get/set_user_reg(), which makes some conceptual
> sense.
>
> (The original reason for the helper.c/op_helper.c split was that
> only op_helper.c had access to the CPU env pointer; this distinction
> has not been true for a long time, though, and so the split is
> now rather arbitrary.)
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
> ---
> target-arm/helper.c | 33 ---------------------------------
> target-arm/op_helper.c | 37 +++++++++++++++++++++++++++++++++++++
> 2 files changed, 37 insertions(+), 33 deletions(-)
>
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index bb913c6..c46e3d0 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -5365,21 +5365,6 @@ void switch_mode(CPUARMState *env, int mode)
> }
> }
>
> -void HELPER(set_r13_banked)(CPUARMState *env, uint32_t mode, uint32_t val)
> -{
> - ARMCPU *cpu = arm_env_get_cpu(env);
> -
> - cpu_abort(CPU(cpu), "banked r13 write\n");
> -}
> -
> -uint32_t HELPER(get_r13_banked)(CPUARMState *env, uint32_t mode)
> -{
> - ARMCPU *cpu = arm_env_get_cpu(env);
> -
> - cpu_abort(CPU(cpu), "banked r13 read\n");
> - return 0;
> -}
> -
> uint32_t arm_phys_excp_target_el(CPUState *cs, uint32_t excp_idx,
> uint32_t cur_el, bool secure)
> {
> @@ -7762,24 +7747,6 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr,
> return phys_addr;
> }
>
> -void HELPER(set_r13_banked)(CPUARMState *env, uint32_t mode, uint32_t val)
> -{
> - if ((env->uncached_cpsr & CPSR_M) == mode) {
> - env->regs[13] = val;
> - } else {
> - env->banked_r13[bank_number(mode)] = val;
> - }
> -}
> -
> -uint32_t HELPER(get_r13_banked)(CPUARMState *env, uint32_t mode)
> -{
> - if ((env->uncached_cpsr & CPSR_M) == mode) {
> - return env->regs[13];
> - } else {
> - return env->banked_r13[bank_number(mode)];
> - }
> -}
> -
> uint32_t HELPER(v7m_mrs)(CPUARMState *env, uint32_t reg)
> {
> ARMCPU *cpu = arm_env_get_cpu(env);
> diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
> index 049b521..053e9b6 100644
> --- a/target-arm/op_helper.c
> +++ b/target-arm/op_helper.c
> @@ -457,6 +457,43 @@ void HELPER(set_user_reg)(CPUARMState *env, uint32_t regno, uint32_t val)
> }
> }
>
> +#if defined(CONFIG_USER_ONLY)
> +void HELPER(set_r13_banked)(CPUARMState *env, uint32_t mode, uint32_t val)
> +{
> + ARMCPU *cpu = arm_env_get_cpu(env);
> +
> + cpu_abort(CPU(cpu), "banked r13 write\n");
> +}
> +
> +uint32_t HELPER(get_r13_banked)(CPUARMState *env, uint32_t mode)
> +{
> + ARMCPU *cpu = arm_env_get_cpu(env);
> +
> + cpu_abort(CPU(cpu), "banked r13 read\n");
> + return 0;
> +}
> +
> +#else
> +
> +void HELPER(set_r13_banked)(CPUARMState *env, uint32_t mode, uint32_t val)
> +{
> + if ((env->uncached_cpsr & CPSR_M) == mode) {
> + env->regs[13] = val;
> + } else {
> + env->banked_r13[bank_number(mode)] = val;
> + }
> +}
> +
> +uint32_t HELPER(get_r13_banked)(CPUARMState *env, uint32_t mode)
> +{
> + if ((env->uncached_cpsr & CPSR_M) == mode) {
> + return env->regs[13];
> + } else {
> + return env->banked_r13[bank_number(mode)];
> + }
> +}
> +#endif
> +
> void HELPER(access_check_cp_reg)(CPUARMState *env, void *rip, uint32_t syndrome,
> uint32_t isread)
> {
> --
> 1.9.1
>
next prev parent reply other threads:[~2016-02-12 15:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-11 19:11 [Qemu-devel] [PATCH 0/4] target-arm: Clean up trap/undef handling of SRS Peter Maydell
2016-02-11 19:11 ` [Qemu-devel] [PATCH 1/4] " Peter Maydell
2016-02-12 8:48 ` Sergey Fedorov
2016-02-12 14:56 ` Edgar E. Iglesias
2016-02-11 19:11 ` [Qemu-devel] [PATCH 2/4] target-arm: Move get/set_r13_banked() to op_helper.c Peter Maydell
2016-02-12 8:56 ` Sergey Fedorov
2016-02-12 15:05 ` Edgar E. Iglesias [this message]
2016-02-11 19:11 ` [Qemu-devel] [PATCH 3/4] target-arm: Combine user-only and softmmu get/set_r13_banked() Peter Maydell
2016-02-12 8:58 ` Sergey Fedorov
2016-02-12 15:12 ` Edgar E. Iglesias
2016-02-12 15:15 ` Peter Maydell
2016-02-12 15:16 ` Edgar E. Iglesias
2016-02-12 15:48 ` Sergey Fedorov
2016-02-12 15:49 ` Peter Maydell
2016-02-12 15:15 ` Edgar E. Iglesias
2016-02-11 19:11 ` [Qemu-devel] [PATCH 4/4] target-arm: UNDEF in the UNPREDICTABLE SRS-from-System case Peter Maydell
2016-02-12 9:34 ` Sergey Fedorov
2016-02-12 15:17 ` Edgar E. Iglesias
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=20160212150554.GF31433@toto \
--to=edgar.iglesias@gmail.com \
--cc=patches@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=serge.fdrv@gmail.com \
/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).