From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Alessandro Di Federico" <ale@rev.ng>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Anton Johansson" <anjo@rev.ng>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 02/11] exec: Move cpu_loop_foo() target agnostic functions to 'cpu-common.h'
Date: Thu, 14 Sep 2023 20:57:08 +0200 [thread overview]
Message-ID: <20230914185718.76241-3-philmd@linaro.org> (raw)
In-Reply-To: <20230914185718.76241-1-philmd@linaro.org>
While these functions are not TCG specific, they are not target
specific. Move them to "exec/cpu-common.h" so their callers don't
have to be tainted as target specific.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/exec/cpu-common.h | 32 ++++++++++++++++++++++++++++++++
include/exec/exec-all.h | 30 ------------------------------
2 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 360b8298a4..605b160a7e 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -173,4 +173,36 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,
/* vl.c */
void list_cpus(void);
+#ifdef CONFIG_TCG
+/**
+ * cpu_unwind_state_data:
+ * @cpu: the cpu context
+ * @host_pc: the host pc within the translation
+ * @data: output data
+ *
+ * Attempt to load the the unwind state for a host pc occurring in
+ * translated code. If @host_pc is not in translated code, the
+ * function returns false; otherwise @data is loaded.
+ * This is the same unwind info as given to restore_state_to_opc.
+ */
+bool cpu_unwind_state_data(CPUState *cpu, uintptr_t host_pc, uint64_t *data);
+
+/**
+ * cpu_restore_state:
+ * @cpu: the cpu context
+ * @host_pc: the host pc within the translation
+ * @return: true if state was restored, false otherwise
+ *
+ * Attempt to restore the state for a fault occurring in translated
+ * code. If @host_pc is not in translated code no state is
+ * restored and the function returns false.
+ */
+bool cpu_restore_state(CPUState *cpu, uintptr_t host_pc);
+
+G_NORETURN void cpu_loop_exit_noexc(CPUState *cpu);
+G_NORETURN void cpu_loop_exit_atomic(CPUState *cpu, uintptr_t pc);
+#endif /* CONFIG_TCG */
+G_NORETURN void cpu_loop_exit(CPUState *cpu);
+G_NORETURN void cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc);
+
#endif /* CPU_COMMON_H */
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 2e4d337805..ee90ef122b 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -27,36 +27,6 @@
#include "exec/translation-block.h"
#include "qemu/clang-tsa.h"
-/**
- * cpu_unwind_state_data:
- * @cpu: the cpu context
- * @host_pc: the host pc within the translation
- * @data: output data
- *
- * Attempt to load the the unwind state for a host pc occurring in
- * translated code. If @host_pc is not in translated code, the
- * function returns false; otherwise @data is loaded.
- * This is the same unwind info as given to restore_state_to_opc.
- */
-bool cpu_unwind_state_data(CPUState *cpu, uintptr_t host_pc, uint64_t *data);
-
-/**
- * cpu_restore_state:
- * @cpu: the cpu context
- * @host_pc: the host pc within the translation
- * @return: true if state was restored, false otherwise
- *
- * Attempt to restore the state for a fault occurring in translated
- * code. If @host_pc is not in translated code no state is
- * restored and the function returns false.
- */
-bool cpu_restore_state(CPUState *cpu, uintptr_t host_pc);
-
-G_NORETURN void cpu_loop_exit_noexc(CPUState *cpu);
-G_NORETURN void cpu_loop_exit(CPUState *cpu);
-G_NORETURN void cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc);
-G_NORETURN void cpu_loop_exit_atomic(CPUState *cpu, uintptr_t pc);
-
/**
* cpu_loop_exit_requested:
* @cpu: The CPU state to be tested
--
2.41.0
next prev parent reply other threads:[~2023-09-14 18:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-14 18:57 [PATCH 00/11] accel/tcg: Make more files target agnostic (& exec/ housekeeping) Philippe Mathieu-Daudé
2023-09-14 18:57 ` [PATCH 01/11] exec: Make EXCP_FOO definitions target agnostic Philippe Mathieu-Daudé
2023-09-15 13:24 ` Anton Johansson via
2023-09-14 18:57 ` Philippe Mathieu-Daudé [this message]
2023-09-15 13:54 ` [PATCH 02/11] exec: Move cpu_loop_foo() target agnostic functions to 'cpu-common.h' Anton Johansson via
2023-09-14 18:57 ` [PATCH 03/11] accel/tcg: Restrict dump_exec_info() declaration Philippe Mathieu-Daudé
2023-09-15 13:56 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 04/11] accel: Make accel-blocker.o target agnostic Philippe Mathieu-Daudé
2023-09-15 14:14 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 05/11] accel: Rename accel-common.c -> accel-target.c Philippe Mathieu-Daudé
2023-09-15 14:15 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 06/11] exec: Rename cpu.c -> cpu-target.c Philippe Mathieu-Daudé
2023-09-15 14:19 ` Anton Johansson via
2023-09-15 15:36 ` Philippe Mathieu-Daudé
2023-09-14 18:57 ` [PATCH 07/11] exec: Rename target specific page-vary.c -> page-vary-target.c Philippe Mathieu-Daudé
2023-09-15 14:20 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 08/11] accel/tcg: Rename target-specific 'internal.h' -> 'internal-target.h' Philippe Mathieu-Daudé
2023-09-15 14:22 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 09/11] accel/tcg: Make monitor.c a target-agnostic unit Philippe Mathieu-Daudé
2023-09-15 14:25 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 10/11] accel/tcg: Make icount.o a target agnostic unit Philippe Mathieu-Daudé
2023-09-15 14:31 ` Anton Johansson via
2023-09-15 15:39 ` Philippe Mathieu-Daudé
2023-09-15 15:46 ` Anton Johansson via
2023-09-14 18:57 ` [PATCH 11/11] accel/tcg: Make cpu-exec-common.c " Philippe Mathieu-Daudé
2023-09-15 14:35 ` Anton Johansson via
2023-09-15 12:22 ` [PATCH 00/11] accel/tcg: Make more files target agnostic (& exec/ housekeeping) Anton Johansson via
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=20230914185718.76241-3-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=ale@rev.ng \
--cc=anjo@rev.ng \
--cc=berrange@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=riku.voipio@iki.fi \
--cc=thuth@redhat.com \
/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).