qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Pierrick Bouvier" <pierrick.bouvier@linaro.org>
Subject: [PULL 13/32] accel/tcg: Move common declarations to 'internal-common.h'
Date: Tue,  4 Jun 2024 11:55:49 +0200	[thread overview]
Message-ID: <20240604095609.12285-14-philmd@linaro.org> (raw)
In-Reply-To: <20240604095609.12285-1-philmd@linaro.org>

'internal-target.h' is meant for target-specific declarations,
while 'internal-common.h' for common ones. Move common declarations
to it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240528145953.65398-3-philmd@linaro.org>
---
 accel/tcg/internal-common.h | 15 +++++++++++++++
 accel/tcg/internal-target.h | 14 --------------
 accel/tcg/tcg-all.c         |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/accel/tcg/internal-common.h b/accel/tcg/internal-common.h
index cff43d221b..a8fc3db774 100644
--- a/accel/tcg/internal-common.h
+++ b/accel/tcg/internal-common.h
@@ -15,6 +15,8 @@
 extern int64_t max_delay;
 extern int64_t max_advance;
 
+extern bool one_insn_per_tb;
+
 /*
  * Return true if CS is not running in parallel with other cpus, either
  * because there are no other cpus or we are within an exclusive context.
@@ -41,4 +43,17 @@ static inline bool cpu_plugin_mem_cbs_enabled(const CPUState *cpu)
 #endif
 }
 
+TranslationBlock *tb_gen_code(CPUState *cpu, vaddr pc,
+                              uint64_t cs_base, uint32_t flags,
+                              int cflags);
+void page_init(void);
+void tb_htable_init(void);
+void tb_reset_jump(TranslationBlock *tb, int n);
+TranslationBlock *tb_link_page(TranslationBlock *tb);
+void cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb,
+                               uintptr_t host_pc);
+
+bool tcg_exec_realizefn(CPUState *cpu, Error **errp);
+void tcg_exec_unrealizefn(CPUState *cpu);
+
 #endif
diff --git a/accel/tcg/internal-target.h b/accel/tcg/internal-target.h
index 4e36cf858e..fe109724c6 100644
--- a/accel/tcg/internal-target.h
+++ b/accel/tcg/internal-target.h
@@ -69,19 +69,7 @@ void tb_invalidate_phys_range_fast(ram_addr_t ram_addr,
 G_NORETURN void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);
 #endif /* CONFIG_SOFTMMU */
 
-TranslationBlock *tb_gen_code(CPUState *cpu, vaddr pc,
-                              uint64_t cs_base, uint32_t flags,
-                              int cflags);
-void page_init(void);
-void tb_htable_init(void);
-void tb_reset_jump(TranslationBlock *tb, int n);
-TranslationBlock *tb_link_page(TranslationBlock *tb);
 bool tb_invalidate_phys_page_unwind(tb_page_addr_t addr, uintptr_t pc);
-void cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb,
-                               uintptr_t host_pc);
-
-bool tcg_exec_realizefn(CPUState *cpu, Error **errp);
-void tcg_exec_unrealizefn(CPUState *cpu);
 
 /* Return the current PC from CPU, which may be cached in TB. */
 static inline vaddr log_pc(CPUState *cpu, const TranslationBlock *tb)
@@ -93,8 +81,6 @@ static inline vaddr log_pc(CPUState *cpu, const TranslationBlock *tb)
     }
 }
 
-extern bool one_insn_per_tb;
-
 /**
  * tcg_req_mo:
  * @type: TCGBar
diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
index c6619f5b98..2090907dba 100644
--- a/accel/tcg/tcg-all.c
+++ b/accel/tcg/tcg-all.c
@@ -38,7 +38,7 @@
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/boards.h"
 #endif
-#include "internal-target.h"
+#include "internal-common.h"
 
 struct TCGState {
     AccelState parent_obj;
-- 
2.41.0



  parent reply	other threads:[~2024-06-04  9:57 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-04  9:55 [PULL 00/32] Misc HW / accel patches Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 01/32] target/riscv: Remove unused 'instmap.h' header in translate.c Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 02/32] target/riscv: Restrict 'rv128' machine to TCG accelerator Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 03/32] target/riscv: Restrict riscv_cpu_do_interrupt() to sysemu Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 04/32] target/mips: Remove unused 'hw/misc/mips_itu.h' header Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 05/32] target/arm: Replace sprintf() by snprintf() Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 06/32] target/i386/kvm: Improve KVM_EXIT_NOTIFY warnings Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 07/32] disas/m68k: Replace sprintf() by snprintf() Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 08/32] disas/microblaze: " Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 09/32] util/hexdump: Remove b parameter from qemu_hexdump_line Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 10/32] util/hexdump: Remove ascii " Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 11/32] MAINTAINERS: drop usb maintainership Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 12/32] system/runstate: Remove unused 'qemu/plugin.h' header Philippe Mathieu-Daudé
2024-06-04  9:55 ` Philippe Mathieu-Daudé [this message]
2024-06-04  9:55 ` [PULL 14/32] accel/kvm: Fix two lines with hard-coded tabs Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 15/32] hw/core: expand on the alignment of CPUState Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 16/32] cpu: move Qemu[Thread|Cond] setup into common code Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 17/32] cpu-target: don't set cpu->thread_id to bogus value Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 18/32] plugins: remove special casing for cpu->realized Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 19/32] core/cpu-common: initialise plugin state before thread creation Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 20/32] xen: Add xen_mr_is_memory() Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 21/32] physmem: Always pass offset + addr to xen_map_cache Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 22/32] physmem: Replace check for RAMBlock offset 0 with xen_mr_is_memory Philippe Mathieu-Daudé
2024-06-04  9:55 ` [PULL 23/32] hw/xen: Constify XenLegacyDevice::XenDevOps Philippe Mathieu-Daudé
2024-06-04  9:56 ` [PULL 24/32] hw/xen: Constify xenstore_be::XenDevOps Philippe Mathieu-Daudé
2024-06-04  9:56 ` [PULL 25/32] hw/xen: Make XenDevOps structures const Philippe Mathieu-Daudé
2024-06-04  9:56 ` [PULL 26/32] hw/xen: Register framebuffer backend via xen_backend_init() Philippe Mathieu-Daudé
2024-06-04  9:56 ` [PULL 27/32] hw/misc/debugexit: use runstate API instead of plain exit() Philippe Mathieu-Daudé
2024-06-04  9:56 ` [PULL 28/32] hw/dma/xlnx_dpdma: Read descriptor into buffer, not into pointer-to-buffer Philippe Mathieu-Daudé
2024-06-04  9:56 ` [PULL 29/32] hw/acpi: Remove the deprecated QAPI MEM_UNPLUG_ERROR event Philippe Mathieu-Daudé
2024-06-04  9:56 ` [PULL 30/32] trace: Remove deprecated 'vcpu' field from QMP trace events Philippe Mathieu-Daudé
2024-06-04  9:56 ` [PULL 31/32] qga: Remove deprecated 'blacklist' argument / config key Philippe Mathieu-Daudé
2024-06-04  9:56 ` [PULL 32/32] usb: add config options for the hub and hid devices Philippe Mathieu-Daudé
2024-06-04 21:25 ` [PULL 00/32] Misc HW / accel patches Richard Henderson

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=20240604095609.12285-14-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=pierrick.bouvier@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).