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, mark.cave-ayland@ilande.co.uk,
	alex.bennee@linaro.org, f4bug@amsat.org
Subject: [PATCH v3 07/13] accel/tcg: Move cflags lookup into tb_find
Date: Sat, 17 Jul 2021 15:18:45 -0700	[thread overview]
Message-ID: <20210717221851.2124573-8-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210717221851.2124573-1-richard.henderson@linaro.org>

We will shortly require the guest pc for computing cflags,
so move the choice just after cpu_get_tb_cpu_state.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/cpu-exec.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 5bb099174f..4d043a11aa 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -502,15 +502,29 @@ static inline void tb_add_jump(TranslationBlock *tb, int n,
 
 static inline TranslationBlock *tb_find(CPUState *cpu,
                                         TranslationBlock *last_tb,
-                                        int tb_exit, uint32_t cflags)
+                                        int tb_exit)
 {
     CPUArchState *env = (CPUArchState *)cpu->env_ptr;
     TranslationBlock *tb;
     target_ulong cs_base, pc;
-    uint32_t flags;
+    uint32_t flags, cflags;
 
     cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags);
 
+    /*
+     * When requested, use an exact setting for cflags for the next
+     * execution.  This is used for icount, precise smc, and stop-
+     * after-access watchpoints.  Since this request should never
+     * have CF_INVALID set, -1 is a convenient invalid value that
+     * does not require tcg headers for cpu_common_reset.
+     */
+    cflags = cpu->cflags_next_tb;
+    if (cflags == -1) {
+        cflags = curr_cflags(cpu);
+    } else {
+        cpu->cflags_next_tb = -1;
+    }
+
     tb = tb_lookup(cpu, pc, cs_base, flags, cflags);
     if (tb == NULL) {
         mmap_lock();
@@ -868,21 +882,7 @@ int cpu_exec(CPUState *cpu)
         int tb_exit = 0;
 
         while (!cpu_handle_interrupt(cpu, &last_tb)) {
-            uint32_t cflags = cpu->cflags_next_tb;
-            TranslationBlock *tb;
-
-            /* When requested, use an exact setting for cflags for the next
-               execution.  This is used for icount, precise smc, and stop-
-               after-access watchpoints.  Since this request should never
-               have CF_INVALID set, -1 is a convenient invalid value that
-               does not require tcg headers for cpu_common_reset.  */
-            if (cflags == -1) {
-                cflags = curr_cflags(cpu);
-            } else {
-                cpu->cflags_next_tb = -1;
-            }
-
-            tb = tb_find(cpu, last_tb, tb_exit, cflags);
+            TranslationBlock *tb = tb_find(cpu, last_tb, tb_exit);
             cpu_loop_exec_tb(cpu, tb, &last_tb, &tb_exit);
             /* Try to align the host and virtual clocks
                if the guest is in advance */
-- 
2.25.1



  parent reply	other threads:[~2021-07-17 22:21 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-17 22:18 [PATCH v3 00/13] tcg: breakpoint reorg Richard Henderson
2021-07-17 22:18 ` [PATCH v3 01/13] accel/tcg: Reduce CF_COUNT_MASK to match TCG_MAX_INSNS Richard Henderson
2021-07-17 23:33   ` Peter Maydell
2021-07-17 22:18 ` [PATCH v3 02/13] accel/tcg: Move curr_cflags into cpu-exec.c Richard Henderson
2021-07-19 22:06   ` Philippe Mathieu-Daudé
2021-07-17 22:18 ` [PATCH v3 03/13] accel/tcg: Add CF_NO_GOTO_TB and CF_NO_GOTO_PTR Richard Henderson
2021-07-17 22:18 ` [PATCH v3 04/13] accel/tcg: Drop CF_NO_GOTO_PTR from -d nochain Richard Henderson
2021-07-17 22:18 ` [PATCH v3 05/13] accel/tcg: Handle -singlestep in curr_cflags Richard Henderson
2021-07-17 22:18 ` [PATCH v3 06/13] accel/tcg: Use CF_NO_GOTO_{TB, PTR} in cpu_exec_step_atomic Richard Henderson
2021-07-17 22:18 ` Richard Henderson [this message]
2021-07-19 16:47   ` [PATCH v3 07/13] accel/tcg: Move cflags lookup into tb_find Alex Bennée
2021-07-17 22:18 ` [PATCH v3 08/13] target/avr: Advance pc in avr_tr_breakpoint_check Richard Henderson
2021-07-17 23:33   ` Peter Maydell
2021-07-18  7:54   ` Philippe Mathieu-Daudé
2021-07-19  9:35   ` Philippe Mathieu-Daudé
2021-07-17 22:18 ` [PATCH v3 09/13] target/mips: Reduce mips_tr_breakpoint_check pc advance to 2 Richard Henderson
2021-07-17 23:33   ` Peter Maydell
2021-07-18  7:53   ` Philippe Mathieu-Daudé
2021-07-17 22:18 ` [PATCH v3 10/13] target/riscv: Reduce riscv_tr_breakpoint_check " Richard Henderson
2021-07-17 23:35   ` Peter Maydell
2021-07-18 18:02     ` Richard Henderson
2021-07-18 18:16       ` Peter Maydell
2021-07-18 18:50         ` Richard Henderson
2021-07-17 22:18 ` [PATCH v3 11/13] accel/tcg: Adjust interface of TranslatorOps.breakpoint_check Richard Henderson
2021-07-17 22:18 ` [PATCH v3 12/13] accel/tcg: Hoist tb_cflags to a local in translator_loop Richard Henderson
2021-07-17 22:18 ` [PATCH v3 13/13] accel/tcg: Encode breakpoint info into tb->cflags Richard Henderson
2021-07-19 10:30   ` 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=20210717221851.2124573-8-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=f4bug@amsat.org \
    --cc=mark.cave-ayland@ilande.co.uk \
    --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 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.