From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, alex.bennee@linaro.org
Subject: [PATCH v3 09/20] target/arm: Tidy msr_mask
Date: Mon, 3 Feb 2020 14:47:05 +0000 [thread overview]
Message-ID: <20200203144716.32204-10-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200203144716.32204-1-richard.henderson@linaro.org>
The CPSR_USER mask for IS_USER already avoids all of the RES0
bits as per aarch32_cpsr_valid_mask. Fix up the formatting.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/translate.c | 42 ++++++++++++++++++++++++------------------
1 file changed, 24 insertions(+), 18 deletions(-)
diff --git a/target/arm/translate.c b/target/arm/translate.c
index 032f7074cb..2b3bfcf7ca 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -2734,28 +2734,34 @@ static inline void gen_mulxy(TCGv_i32 t0, TCGv_i32 t1, int x, int y)
/* Return the mask of PSR bits set by a MSR instruction. */
static uint32_t msr_mask(DisasContext *s, int flags, int spsr)
{
- uint32_t mask;
+ uint32_t mask = 0;
- mask = 0;
- if (flags & (1 << 0))
+ if (flags & (1 << 0)) {
mask |= 0xff;
- if (flags & (1 << 1))
- mask |= 0xff00;
- if (flags & (1 << 2))
- mask |= 0xff0000;
- if (flags & (1 << 3))
- mask |= 0xff000000;
-
- /* Mask out undefined bits. */
- mask &= aarch32_cpsr_valid_mask(s->features, s->isar);
-
- /* Mask out execution state and reserved bits. */
- if (!spsr) {
- mask &= ~CPSR_EXEC;
}
- /* Mask out privileged bits. */
- if (IS_USER(s))
+ if (flags & (1 << 1)) {
+ mask |= 0xff00;
+ }
+ if (flags & (1 << 2)) {
+ mask |= 0xff0000;
+ }
+ if (flags & (1 << 3)) {
+ mask |= 0xff000000;
+ }
+
+ if (IS_USER(s)) {
+ /* Mask out privileged bits. */
mask &= CPSR_USER;
+ } else {
+ /* Mask out undefined bits. */
+ mask &= aarch32_cpsr_valid_mask(s->features, s->isar);
+
+ /* Mask out execution state and reserved bits. */
+ if (!spsr) {
+ mask &= ~CPSR_EXEC;
+ }
+ }
+
return mask;
}
--
2.20.1
next prev parent reply other threads:[~2020-02-03 14:50 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-03 14:46 [PATCH v3 00/20] target/arm: Implement PAN, ATS1E1, UAO Richard Henderson
2020-02-03 14:46 ` [PATCH v3 01/20] target/arm: Add arm_mmu_idx_is_stage1_of_2 Richard Henderson
2020-02-03 14:46 ` [PATCH v3 02/20] target/arm: Add mmu_idx for EL1 and EL2 w/ PAN enabled Richard Henderson
2020-02-03 14:46 ` [PATCH v3 03/20] target/arm: Add isar_feature tests for PAN + ATS1E1 Richard Henderson
2020-02-03 14:47 ` [PATCH v3 04/20] target/arm: Move LOR regdefs to file scope Richard Henderson
2020-02-03 14:47 ` [PATCH v3 05/20] target/arm: Split out aarch32_cpsr_valid_mask Richard Henderson
2020-02-07 17:26 ` Peter Maydell
2020-02-03 14:47 ` [PATCH v3 06/20] target/arm: Replace CPSR_ERET_MASK with aarch32_cpsr_valid_mask Richard Henderson
2020-02-07 17:32 ` Peter Maydell
2020-02-03 14:47 ` [PATCH v3 07/20] target/arm: Use aarch32_cpsr_valid_mask in helper_exception_return Richard Henderson
2020-02-07 17:33 ` Peter Maydell
2020-02-03 14:47 ` [PATCH v3 08/20] target/arm: Remove CPSR_RESERVED Richard Henderson
2020-02-07 17:36 ` Peter Maydell
2020-02-08 8:26 ` Richard Henderson
2020-02-03 14:47 ` Richard Henderson [this message]
2020-02-07 17:40 ` [PATCH v3 09/20] target/arm: Tidy msr_mask Peter Maydell
2020-02-08 8:29 ` Richard Henderson
2020-02-03 14:47 ` [PATCH v3 10/20] target/arm: Introduce aarch64_pstate_valid_mask Richard Henderson
2020-02-07 17:43 ` Peter Maydell
2020-02-03 14:47 ` [PATCH v3 11/20] target/arm: Update MSR access for PAN Richard Henderson
2020-02-07 17:49 ` Peter Maydell
2020-02-03 14:47 ` [PATCH v3 12/20] target/arm: Update arm_mmu_idx_el " Richard Henderson
2020-02-03 14:47 ` [PATCH v3 13/20] target/arm: Enforce PAN semantics in get_S1prot Richard Henderson
2020-02-03 14:47 ` [PATCH v3 14/20] target/arm: Set PAN bit as required on exception entry Richard Henderson
2020-02-07 18:01 ` Peter Maydell
2020-02-08 8:45 ` Richard Henderson
2020-02-08 9:27 ` Richard Henderson
2020-02-03 14:47 ` [PATCH v3 15/20] target/arm: Implement ATS1E1 system registers Richard Henderson
2020-02-03 14:47 ` [PATCH v3 16/20] target/arm: Enable ARMv8.2-ATS1E1 in -cpu max Richard Henderson
2020-02-03 14:47 ` [PATCH v3 17/20] target/arm: Add ID_AA64MMFR2_EL1 Richard Henderson
2020-02-03 14:47 ` [PATCH v3 18/20] target/arm: Update MSR access to UAO Richard Henderson
2020-02-07 17:52 ` Peter Maydell
2020-02-03 14:47 ` [PATCH v3 19/20] target/arm: Implement UAO semantics Richard Henderson
2020-02-03 14:47 ` [PATCH v3 20/20] target/arm: Enable ARMv8.2-UAO in -cpu max Richard Henderson
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=20200203144716.32204-10-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.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).