All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org
Subject: [PATCH v8 10/22] target/arm: Simplify set of PSTATE_SS in cpu_get_tb_cpu_state
Date: Fri, 18 Oct 2019 10:44:19 -0700	[thread overview]
Message-ID: <20191018174431.1784-11-richard.henderson@linaro.org> (raw)
In-Reply-To: <20191018174431.1784-1-richard.henderson@linaro.org>

Hoist the variable load for PSTATE into the existing test vs is_a64.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/arm/helper.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/target/arm/helper.c b/target/arm/helper.c
index e2a62cf19a..398e5f5d6d 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -11197,7 +11197,7 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc,
     ARMMMUIdx mmu_idx = arm_mmu_idx(env);
     int current_el = arm_current_el(env);
     int fp_el = fp_exception_el(env, current_el);
-    uint32_t flags;
+    uint32_t flags, pstate_for_ss;
 
     if (is_a64(env)) {
         *pc = env->pc;
@@ -11205,6 +11205,7 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc,
         if (cpu_isar_feature(aa64_bti, env_archcpu(env))) {
             flags = FIELD_DP32(flags, TBFLAG_A64, BTYPE, env->btype);
         }
+        pstate_for_ss = env->pstate;
     } else {
         *pc = env->regs[15];
 
@@ -11257,9 +11258,11 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc,
             || arm_el_is_aa64(env, 1) || arm_feature(env, ARM_FEATURE_M)) {
             flags = FIELD_DP32(flags, TBFLAG_A32, VFPEN, 1);
         }
+        pstate_for_ss = env->uncached_cpsr;
     }
 
-    /* The SS_ACTIVE and PSTATE_SS bits correspond to the state machine
+    /*
+     * The SS_ACTIVE and PSTATE_SS bits correspond to the state machine
      * states defined in the ARM ARM for software singlestep:
      *  SS_ACTIVE   PSTATE.SS   State
      *     0            x       Inactive (the TB flag for SS is always 0)
@@ -11267,16 +11270,9 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc,
      *     1            1       Active-not-pending
      * SS_ACTIVE is set in hflags; PSTATE_SS is computed every TB.
      */
-    if (FIELD_EX32(flags, TBFLAG_ANY, SS_ACTIVE)) {
-        if (is_a64(env)) {
-            if (env->pstate & PSTATE_SS) {
-                flags = FIELD_DP32(flags, TBFLAG_ANY, PSTATE_SS, 1);
-            }
-        } else {
-            if (env->uncached_cpsr & PSTATE_SS) {
-                flags = FIELD_DP32(flags, TBFLAG_ANY, PSTATE_SS, 1);
-            }
-        }
+    if (FIELD_EX32(flags, TBFLAG_ANY, SS_ACTIVE) &&
+        (pstate_for_ss & PSTATE_SS)) {
+        flags = FIELD_DP32(flags, TBFLAG_ANY, PSTATE_SS, 1);
     }
 
     *pflags = flags;
-- 
2.17.1



  parent reply	other threads:[~2019-10-18 18:06 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-18 17:44 [PATCH v8 00/22] target/arm: Reduce overhead of cpu_get_tb_cpu_state Richard Henderson
2019-10-18 17:44 ` [PATCH v8 01/22] target/arm: Split out rebuild_hflags_common Richard Henderson
2019-10-18 17:44 ` [PATCH v8 02/22] target/arm: Split out rebuild_hflags_a64 Richard Henderson
2019-10-18 17:44 ` [PATCH v8 03/22] target/arm: Split out rebuild_hflags_common_32 Richard Henderson
2019-10-18 17:44 ` [PATCH v8 04/22] target/arm: Split arm_cpu_data_is_big_endian Richard Henderson
2019-10-18 17:44 ` [PATCH v8 05/22] target/arm: Split out rebuild_hflags_m32 Richard Henderson
2019-10-18 17:44 ` [PATCH v8 06/22] target/arm: Reduce tests vs M-profile in cpu_get_tb_cpu_state Richard Henderson
2019-10-18 17:44 ` [PATCH v8 07/22] target/arm: Split out rebuild_hflags_a32 Richard Henderson
2019-10-18 17:44 ` [PATCH v8 08/22] target/arm: Split out rebuild_hflags_aprofile Richard Henderson
2019-10-18 17:44 ` [PATCH v8 09/22] target/arm: Hoist XSCALE_CPAR, VECLEN, VECSTRIDE in cpu_get_tb_cpu_state Richard Henderson
2019-10-18 17:44 ` Richard Henderson [this message]
2019-10-18 17:44 ` [PATCH v8 11/22] target/arm: Hoist computation of TBFLAG_A32.VFPEN Richard Henderson
2019-10-18 17:44 ` [PATCH v8 12/22] target/arm: Add arm_rebuild_hflags Richard Henderson
2019-10-18 17:44 ` [PATCH v8 13/22] target/arm: Split out arm_mmu_idx_el Richard Henderson
2019-10-18 17:44 ` [PATCH v8 14/22] target/arm: Hoist store to cs_base in cpu_get_tb_cpu_state Richard Henderson
2019-10-18 17:44 ` [PATCH v8 15/22] target/arm: Add HELPER(rebuild_hflags_{a32, a64, m32}) Richard Henderson
2019-10-18 17:44 ` [PATCH v8 16/22] target/arm: Rebuild hflags at EL changes Richard Henderson
2019-10-18 17:44 ` [PATCH v8 17/22] target/arm: Rebuild hflags at MSR writes Richard Henderson
2019-10-18 17:44 ` [PATCH v8 18/22] target/arm: Rebuild hflags at CPSR writes Richard Henderson
2019-10-18 17:44 ` [PATCH v8 19/22] target/arm: Rebuild hflags at Xscale SCTLR writes Richard Henderson
2019-10-18 17:44 ` [PATCH v8 20/22] target/arm: Rebuild hflags for M-profile Richard Henderson
2019-10-18 17:44 ` [PATCH v8 21/22] target/arm: Rebuild hflags for M-profile NVIC Richard Henderson
2019-10-18 17:44 ` [PATCH v8 22/22] target/arm: Rely on hflags correct in cpu_get_tb_cpu_state Richard Henderson
2019-10-22 12:47 ` [PATCH v8 00/22] target/arm: Reduce overhead of cpu_get_tb_cpu_state Peter Maydell
2019-10-22 15:38   ` Peter Maydell
2019-10-23 14:49     ` Richard Henderson
2019-10-23 15:17       ` Alex Bennée
2019-10-23 16:13         ` Richard Henderson
2019-10-23 18:06           ` Alex Bennée

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=20191018174431.1784-11-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=peter.maydell@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.