From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH 38/41] accel/tcg: Split out log_cpu_exec
Date: Sat, 10 Jul 2021 08:31:40 -0700 [thread overview]
Message-ID: <20210710153143.1320521-39-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210710153143.1320521-1-richard.henderson@linaro.org>
Split out CPU_LOG_EXEC and CPU_LOG_TB_CPU logging from
cpu_tb_exec to a new function. Perform only one pc
range check after a combined mask check.
Use the new function in lookup_tb_ptr. This enables
CPU_LOG_TB_CPU between indirectly chained tbs.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/cpu-exec.c | 61 ++++++++++++++++++++++++--------------------
1 file changed, 34 insertions(+), 27 deletions(-)
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 0d92698030..67ed25beb9 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -175,6 +175,36 @@ static inline TranslationBlock *tb_lookup(CPUState *cpu, target_ulong pc,
return tb;
}
+static inline void log_cpu_exec(target_ulong pc, CPUState *cpu,
+ const TranslationBlock *tb)
+{
+ if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_CPU | CPU_LOG_EXEC))
+ && qemu_log_in_addr_range(pc)) {
+
+ qemu_log_mask(CPU_LOG_EXEC,
+ "Trace %d: %p [" TARGET_FMT_lx
+ "/" TARGET_FMT_lx "/%#x] %s\n",
+ cpu->cpu_index, tb->tc.ptr, tb->cs_base, pc, tb->flags,
+ lookup_symbol(pc));
+
+#if defined(DEBUG_DISAS)
+ if (qemu_loglevel_mask(CPU_LOG_TB_CPU)) {
+ FILE *logfile = qemu_log_lock();
+ int flags = 0;
+
+ if (qemu_loglevel_mask(CPU_LOG_TB_FPU)) {
+ flags |= CPU_DUMP_FPU;
+ }
+#if defined(TARGET_I386)
+ flags |= CPU_DUMP_CCOP;
+#endif
+ log_cpu_state(cpu, flags);
+ qemu_log_unlock(logfile);
+ }
+#endif /* DEBUG_DISAS */
+ }
+}
+
/**
* helper_lookup_tb_ptr: quick check for next tb
* @env: current cpu state
@@ -196,11 +226,9 @@ const void *HELPER(lookup_tb_ptr)(CPUArchState *env)
if (tb == NULL) {
return tcg_code_gen_epilogue;
}
- qemu_log_mask_and_addr(CPU_LOG_EXEC, pc,
- "Chain %d: %p ["
- TARGET_FMT_lx "/" TARGET_FMT_lx "/%#x] %s\n",
- cpu->cpu_index, tb->tc.ptr, cs_base, pc, flags,
- lookup_symbol(pc));
+
+ log_cpu_exec(pc, cpu, tb);
+
return tb->tc.ptr;
}
@@ -222,28 +250,7 @@ cpu_tb_exec(CPUState *cpu, TranslationBlock *itb, int *tb_exit)
TranslationBlock *last_tb;
const void *tb_ptr = itb->tc.ptr;
- qemu_log_mask_and_addr(CPU_LOG_EXEC, itb->pc,
- "Trace %d: %p ["
- TARGET_FMT_lx "/" TARGET_FMT_lx "/%#x] %s\n",
- cpu->cpu_index, itb->tc.ptr,
- itb->cs_base, itb->pc, itb->flags,
- lookup_symbol(itb->pc));
-
-#if defined(DEBUG_DISAS)
- if (qemu_loglevel_mask(CPU_LOG_TB_CPU)
- && qemu_log_in_addr_range(itb->pc)) {
- FILE *logfile = qemu_log_lock();
- int flags = 0;
- if (qemu_loglevel_mask(CPU_LOG_TB_FPU)) {
- flags |= CPU_DUMP_FPU;
- }
-#if defined(TARGET_I386)
- flags |= CPU_DUMP_CCOP;
-#endif
- log_cpu_state(cpu, flags);
- qemu_log_unlock(logfile);
- }
-#endif /* DEBUG_DISAS */
+ log_cpu_exec(itb->pc, cpu, itb);
qemu_thread_jit_execute();
ret = tcg_qemu_tb_exec(env, tb_ptr);
--
2.25.1
next prev parent reply other threads:[~2021-07-10 15:59 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-10 15:31 [PATCH 00/41] tcg patch queue Richard Henderson
2021-07-10 15:31 ` [PATCH 01/41] tcg: Add separator in INDEX_op_call dump Richard Henderson
2021-07-10 15:31 ` [PATCH 02/41] tcg: Avoid including 'trace-tcg.h' in target translate.c Richard Henderson
2021-07-10 15:31 ` [PATCH 03/41] accel/tcg: Hoist tcg_tb_insert() up above tb_link_page() Richard Henderson
2021-07-10 15:31 ` [PATCH 04/41] tcg: Bake tb_destroy() into tcg_region_tree Richard Henderson
2021-07-10 15:31 ` [PATCH 05/41] tcg: Move tb_phys_invalidate_count to tb_ctx Richard Henderson
2021-07-10 15:31 ` [PATCH 06/41] accel/tcg: Introduce translator_use_goto_tb Richard Henderson
2021-07-10 15:31 ` [PATCH 07/41] target/alpha: Remove use_exit_tb Richard Henderson
2021-07-10 15:31 ` [PATCH 08/41] target/alpha: Remove in_superpage Richard Henderson
2021-07-10 15:31 ` [PATCH 09/41] target/alpha: Use translator_use_goto_tb Richard Henderson
2021-07-10 15:31 ` [PATCH 10/41] target/arm: Use DISAS_TOO_MANY for ISB and SB Richard Henderson
2021-07-10 15:31 ` [PATCH 11/41] target/arm: Use translator_use_goto_tb for aarch64 Richard Henderson
2021-07-10 15:31 ` [PATCH 12/41] target/arm: Use translator_use_goto_tb for aarch32 Richard Henderson
2021-07-10 15:31 ` [PATCH 13/41] target/avr: Use translator_use_goto_tb Richard Henderson
2021-07-10 15:31 ` [PATCH 14/41] target/avr: Mark some helpers noreturn Richard Henderson
2021-07-10 15:31 ` [PATCH 15/41] target/cris: Use translator_use_goto_tb Richard Henderson
2021-07-10 15:31 ` [PATCH 16/41] target/hppa: " Richard Henderson
2021-07-10 15:31 ` [PATCH 17/41] target/i386: " Richard Henderson
2021-07-10 15:31 ` [PATCH 18/41] target/m68k: " Richard Henderson
2021-07-10 15:31 ` [PATCH 19/41] target/microblaze: " Richard Henderson
2021-07-10 15:31 ` [PATCH 20/41] target/mips: " Richard Henderson
2021-07-10 15:31 ` [PATCH 21/41] target/mips: Fix missing else in gen_goto_tb Richard Henderson
2021-07-10 15:31 ` [PATCH 22/41] target/nios2: Use translator_use_goto_tb Richard Henderson
2021-07-10 15:31 ` [PATCH 23/41] target/openrisc: " Richard Henderson
2021-07-10 15:31 ` [PATCH 24/41] target/ppc: " Richard Henderson
2021-07-10 15:31 ` [PATCH 25/41] target/riscv: " Richard Henderson
2021-07-10 15:31 ` [PATCH 26/41] target/rx: " Richard Henderson
2021-07-10 15:31 ` [PATCH 27/41] target/s390x: " Richard Henderson
2021-07-10 15:31 ` [PATCH 28/41] target/s390x: Remove use_exit_tb Richard Henderson
2021-07-10 15:31 ` [PATCH 29/41] target/sh4: Use translator_use_goto_tb Richard Henderson
2021-07-10 15:31 ` [PATCH 30/41] target/sparc: " Richard Henderson
2021-07-10 15:31 ` [PATCH 31/41] target/tricore: " Richard Henderson
2021-07-10 15:31 ` [PATCH 32/41] target/tricore: Use tcg_gen_lookup_and_goto_ptr Richard Henderson
2021-07-10 15:31 ` [PATCH 33/41] target/xtensa: Use translator_use_goto_tb Richard Henderson
2021-07-10 15:31 ` [PATCH 34/41] tcg: Fix prologue disassembly Richard Henderson
2021-07-10 15:31 ` [PATCH 35/41] target/i386: Use cpu_breakpoint_test in breakpoint_handler Richard Henderson
2021-07-10 15:31 ` [PATCH 36/41] accel/tcg: Move helper_lookup_tb_ptr to cpu-exec.c Richard Henderson
2021-07-10 15:31 ` [PATCH 37/41] accel/tcg: Move tb_lookup " Richard Henderson
2021-07-10 15:31 ` Richard Henderson [this message]
2021-07-10 15:31 ` [PATCH 39/41] accel/tcg: Log tb->cflags with -d exec Richard Henderson
2021-07-10 15:31 ` [PATCH 40/41] tcg: Remove TCG_TARGET_HAS_goto_ptr Richard Henderson
2021-07-10 15:31 ` [PATCH 41/41] cpu: Add breakpoint tracepoints Richard Henderson
2021-07-10 16:24 ` [PATCH 00/41] tcg patch queue Peter Maydell
2021-07-11 0:12 ` Richard Henderson
2021-07-12 11:53 ` 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=20210710153143.1320521-39-richard.henderson@linaro.org \
--to=richard.henderson@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).