From: Richard Henderson <richard.henderson@linaro.org>
To: Rebecca Cran <rebecca@nuviainc.com>, qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>
Subject: Re: [PATCH v2 1/3] target/arm: Remove PSTATE_SS from cpsr and move it into env->pstate.
Date: Fri, 22 Jan 2021 11:03:57 -1000 [thread overview]
Message-ID: <d2a1c4ed-cac9-4bb9-9c13-e47132df3af9@linaro.org> (raw)
In-Reply-To: <20210122044537.1823-2-rebecca@nuviainc.com>
On 1/21/21 6:45 PM, Rebecca Cran wrote:
> cpsr has been treated as being the same as spsr, but it isn't.
> Since PSTATE_SS isn't in cpsr, remove it and move it into env->pstate.
>
> Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
> ---
> target/arm/helper-a64.c | 4 +---
> target/arm/helper.c | 4 ++--
> target/arm/op_helper.c | 9 +--------
> 3 files changed, 4 insertions(+), 13 deletions(-)
>
> diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c
> index c426c23d2c4e..0d2ac7bb7ee3 100644
> --- a/target/arm/helper-a64.c
> +++ b/target/arm/helper-a64.c
> @@ -1000,9 +1000,7 @@ void HELPER(exception_return)(CPUARMState *env, uint64_t new_pc)
> */
> mask = aarch32_cpsr_valid_mask(env->features, &env_archcpu(env)->isar);
> cpsr_write(env, spsr, mask, CPSRWriteRaw);
> - if (!arm_singlestep_active(env)) {
> - env->uncached_cpsr &= ~PSTATE_SS;
> - }
> + env->pstate &= ~PSTATE_SS;
Why are you removing the singlestep check?
> aarch64_sync_64_to_32(env);
>
> if (spsr & CPSR_T) {
> diff --git a/target/arm/helper.c b/target/arm/helper.c
> index d2ead3fcbdbd..01b50316046b 100644
> --- a/target/arm/helper.c
> +++ b/target/arm/helper.c
> @@ -9402,8 +9402,8 @@ static void take_aarch32_exception(CPUARMState *env, int new_mode,
> * For exceptions taken to AArch32 we must clear the SS bit in both
> * PSTATE and in the old-state value we save to SPSR_<mode>, so zero it now.
> */
> - env->uncached_cpsr &= ~PSTATE_SS;
> - env->spsr = cpsr_read(env);
> + env->pstate &= ~PSTATE_SS;
> + env->spsr &= ~PSTATE_SS;
This loses the saving of cpsr into spsr.
r~
next prev parent reply other threads:[~2021-01-22 21:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 4:45 [PATCH v2 0/3] target/arm: Add support for FEAT_DIT, Data Independent Timing Rebecca Cran
2021-01-22 4:45 ` [PATCH v2 1/3] target/arm: Remove PSTATE_SS from cpsr and move it into env->pstate Rebecca Cran
2021-01-22 21:03 ` Richard Henderson [this message]
2021-01-23 0:28 ` Rebecca Cran
2021-01-22 4:45 ` [PATCH v2 2/3] target/arm: Add support for FEAT_DIT, Data Independent Timing Rebecca Cran
2021-01-22 21:07 ` Richard Henderson
2021-01-22 4:45 ` [PATCH v2 3/3] target/arm: Set ID_AA64PFR0.DIT and ID_PFR0.DIT to 1 for "max" AA64 CPU Rebecca Cran
2021-01-22 21:06 ` Richard Henderson
2021-01-23 0:27 ` Rebecca Cran
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=d2a1c4ed-cac9-4bb9-9c13-e47132df3af9@linaro.org \
--to=richard.henderson@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rebecca@nuviainc.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).