From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 07/10] accel/tcg: Reduce log_pc() declaration scope
Date: Fri, 15 Nov 2024 16:20:50 +0100 [thread overview]
Message-ID: <20241115152053.66442-8-philmd@linaro.org> (raw)
In-Reply-To: <20241115152053.66442-1-philmd@linaro.org>
log_pc() is only used in cpu-exec.c, move it there.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
accel/tcg/internal-target.h | 10 ----------
accel/tcg/cpu-exec.c | 10 ++++++++++
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/accel/tcg/internal-target.h b/accel/tcg/internal-target.h
index fe109724c6..750b3706b1 100644
--- a/accel/tcg/internal-target.h
+++ b/accel/tcg/internal-target.h
@@ -71,16 +71,6 @@ G_NORETURN void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);
bool tb_invalidate_phys_page_unwind(tb_page_addr_t addr, uintptr_t pc);
-/* Return the current PC from CPU, which may be cached in TB. */
-static inline vaddr log_pc(CPUState *cpu, const TranslationBlock *tb)
-{
- if (tb_cflags(tb) & CF_PCREL) {
- return cpu->cc->get_pc(cpu);
- } else {
- return tb->pc;
- }
-}
-
/**
* tcg_req_mo:
* @type: TCGBar
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 033f5fab10..73bc9f00f7 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -433,6 +433,16 @@ const void *HELPER(lookup_tb_ptr)(CPUArchState *env)
return tb->tc.ptr;
}
+/* Return the current PC from CPU, which may be cached in TB. */
+static inline vaddr log_pc(CPUState *cpu, const TranslationBlock *tb)
+{
+ if (tb_cflags(tb) & CF_PCREL) {
+ return cpu->cc->get_pc(cpu);
+ } else {
+ return tb->pc;
+ }
+}
+
/* Execute a TB, and fix up the CPU state afterwards if necessary */
/*
* Disable CFI checks.
--
2.45.2
next prev parent reply other threads:[~2024-11-15 15:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-15 15:20 [PATCH 00/10] accel/tcg: API prototype cleanups Philippe Mathieu-Daudé
2024-11-15 15:20 ` [PATCH 01/10] target/mips: Drop left-over comment about Jazz machine Philippe Mathieu-Daudé
2024-11-15 15:39 ` Peter Maydell
2024-11-15 17:14 ` Richard Henderson
2024-11-15 15:20 ` [PATCH 02/10] target/loongarch: Declare loongarch_cpu_dump_state() locally Philippe Mathieu-Daudé
2024-11-15 15:40 ` Peter Maydell
2024-11-15 17:15 ` Richard Henderson
2024-11-15 15:20 ` [PATCH 03/10] target/sparc: Move sparc_restore_state_to_opc() to cpu.c Philippe Mathieu-Daudé
2024-11-15 15:42 ` Peter Maydell
2024-11-15 17:17 ` Richard Henderson
2024-11-15 15:20 ` [PATCH 04/10] accel/tcg: Ensure frontends define restore_state_to_opc handler Philippe Mathieu-Daudé
2024-11-15 15:20 ` [PATCH 05/10] accel/tcg: Move cpu_unwind_state_data() declaration Philippe Mathieu-Daudé
2024-11-15 15:48 ` Peter Maydell
2024-11-15 16:04 ` Philippe Mathieu-Daudé
2024-11-15 15:20 ` [PATCH 06/10] accel/tcg: Remove cpu_unwind_state_data() unused CPUState argument Philippe Mathieu-Daudé
2024-11-15 15:50 ` Peter Maydell
2024-11-15 17:23 ` Richard Henderson
2024-11-15 17:33 ` Peter Maydell
2025-03-19 7:53 ` Philippe Mathieu-Daudé
2024-11-15 15:20 ` Philippe Mathieu-Daudé [this message]
2024-11-15 15:51 ` [PATCH 07/10] accel/tcg: Reduce log_pc() declaration scope Peter Maydell
2024-11-15 17:26 ` Richard Henderson
2024-11-15 15:20 ` [PATCH 08/10] hw/core/cpu: Pass CPUArchState to set/get_pc() handlers Philippe Mathieu-Daudé
2024-11-15 15:54 ` Peter Maydell
2024-11-15 16:21 ` Paolo Bonzini
2024-11-15 17:51 ` Richard Henderson
2024-11-15 15:20 ` [PATCH 09/10] hw/core/cpu: Pass CPUArchState to restore_state_to_opc() handler Philippe Mathieu-Daudé
2024-11-15 15:20 ` [PATCH 10/10] hw/core/cpu: Pass CPUArchState to cpu_dump_state() handler Philippe Mathieu-Daudé
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=20241115152053.66442-8-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).