accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h'

The TranslationBlock flags are defined in 'exec/translation-block.h'.
tcg_cflags_has/set() use them, it is more logical to declare them in
the same place. Move them there too.

Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20241212144430.66224-2-philmd@linaro.org>

diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index c07e59cd0b1b73b8a4379eb526a98bd6bb1dc85b..b507049ddbeeab880e18e79f3fac971cd45c64b5 100644 (file)
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -27,6 +27,7 @@
 #include "disas/disas.h"
 #include "exec/cpu-common.h"
 #include "exec/page-protection.h"
+#include "exec/translation-block.h"
 #include "tcg/tcg.h"
 #include "qemu/atomic.h"
 #include "qemu/rcu.h"

diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c
index d9a35b7667ce332ff9534752af1ddd97df8cf4a2..6e3f1fa92b24e5946a2aee75d6f2c43c64707f62 100644 (file)
--- a/accel/tcg/tcg-accel-ops.c
+++ b/accel/tcg/tcg-accel-ops.c
@@ -35,6 +35,7 @@
 #include "exec/exec-all.h"
 #include "exec/hwaddr.h"
 #include "exec/tb-flush.h"
+#include "exec/translation-block.h"
 #include "gdbstub/enums.h"
 
 #include "hw/core/cpu.h"

diff --git a/accel/tcg/watchpoint.c b/accel/tcg/watchpoint.c
index fbaf45d10f29e761226cc8bd7f8e83539d02e3c9..af57d182d5bf72dcd0cb86665ac0ed17bd52cab2 100644 (file)
--- a/accel/tcg/watchpoint.c
+++ b/accel/tcg/watchpoint.c
@@ -22,6 +22,7 @@
 #include "qemu/error-report.h"
 #include "exec/exec-all.h"
 #include "exec/page-protection.h"
+#include "exec/translation-block.h"
 #include "tb-internal.h"
 #include "system/tcg.h"
 #include "system/replay.h"

diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 74e947f3adc859d235deb3fded6682810abe79bb..b1d76d69850884dac4362c34b3017168029146f0 100644 (file)
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -188,9 +188,6 @@ void list_cpus(void);
 #ifdef CONFIG_TCG
 #include "qemu/atomic.h"
 
-bool tcg_cflags_has(CPUState *cpu, uint32_t flags);
-void tcg_cflags_set(CPUState *cpu, uint32_t flags);
-
 /**
  * cpu_unwind_state_data:
  * @cpu: the cpu context

diff --git a/include/exec/translation-block.h b/include/exec/translation-block.h
index 81299b7bdb5afa2ede0ea2999e4bd2ca29f56cbf..3c69bc71a9f1880ee3cd3964fa3c95f67dd64dd5 100644 (file)
--- a/include/exec/translation-block.h
+++ b/include/exec/translation-block.h
@@ -154,4 +154,7 @@ static inline uint32_t tb_cflags(const TranslationBlock *tb)
     return qatomic_read(&tb->cflags);
 }
 
+bool tcg_cflags_has(CPUState *cpu, uint32_t flags);
+void tcg_cflags_set(CPUState *cpu, uint32_t flags);
+
 #endif /* EXEC_TRANSLATION_BLOCK_H */

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 4e0444b4cbcd4eb6c3282cfb85ffe2f8e175ae6c..6828b17a63faf495b59031cd9d2ec10c88c29847 100644 (file)
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -21,6 +21,7 @@
 #include "trace.h"
 #include "exec/log.h"
 #include "exec/page-protection.h"
+#include "exec/translation-block.h"
 #include "qemu.h"
 #include "user/page-protection.h"
 #include "user-internals.h"

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1b335688f12480681a87c966748ac4a522408aff..78c7c0b34ef6506b43a9228585c0ead9e8da568c 100644 (file)
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -26,6 +26,7 @@
 #include "tcg/startup.h"
 #include "target_mman.h"
 #include "exec/page-protection.h"
+#include "exec/translation-block.h"
 #include <elf.h>
 #include <endian.h>
 #include <grp.h>

diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index b085c068ad1408b267ac269e99fce47549a21df2..f45cd18ff7ed6466ad4c59dc1fa3ff53b8238e4a 100644 (file)
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -28,6 +28,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #ifdef CONFIG_TCG
+#include "exec/translation-block.h"
 #include "hw/core/tcg-cpu-ops.h"
 #endif /* CONFIG_TCG */
 #include "internals.h"

diff --git a/target/avr/cpu.c b/target/avr/cpu.c
index a7529a1b3d924dd2b86aa1fa772d9ffca15a2bb6..698e0c5161faeeabde6625075c4c22a052fda109 100644 (file)
--- a/target/avr/cpu.c
+++ b/target/avr/cpu.c
@@ -22,6 +22,7 @@
 #include "qapi/error.h"
 #include "qemu/qemu-print.h"
 #include "exec/exec-all.h"
+#include "exec/translation-block.h"
 #include "cpu.h"
 #include "disas/dis-asm.h"
 #include "tcg/debug-assert.h"

diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c
index a70007245e4b48af392c06724792f487bbf7342f..c213ce8d8893b837d6cfa2f13106a86241f06210 100644 (file)
--- a/target/hexagon/cpu.c
+++ b/target/hexagon/cpu.c
@@ -20,6 +20,7 @@
 #include "cpu.h"
 #include "internal.h"
 #include "exec/exec-all.h"
+#include "exec/translation-block.h"
 #include "qapi/error.h"
 #include "hw/qdev-properties.h"
 #include "fpu/softfloat-helpers.h"

diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c
index c38439c1800e2185af8cadbb1db57a0a60f2ef84..c9062e60b6721f2a3b3f032743dfbde00c15aedc 100644 (file)
--- a/target/hppa/cpu.c
+++ b/target/hppa/cpu.c
@@ -25,6 +25,7 @@
 #include "cpu.h"
 #include "qemu/module.h"
 #include "exec/exec-all.h"
+#include "exec/translation-block.h"
 #include "fpu/softfloat.h"
 #include "tcg/tcg.h"
 

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 96a2608e99509e55068e23c025409f0eab604575..f3a97dc61b158257366058d1c5f9e8ea98bedd9f 100644 (file)
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -24,6 +24,7 @@
 #include "qemu/hw-version.h"
 #include "cpu.h"
 #include "tcg/helper-tcg.h"
+#include "exec/translation-block.h"
 #include "system/hvf.h"
 #include "hvf/hvf-i386.h"
 #include "kvm/kvm_i386.h"

diff --git a/target/i386/helper.c b/target/i386/helper.c
index a78d06c95ba06166675e9b0e5fa56dfd3c6554e7..3bc15fba6ee89608d0f3c06cdfc55734956d31c5 100644 (file)
--- a/target/i386/helper.c
+++ b/target/i386/helper.c
@@ -21,6 +21,7 @@
 #include "qapi/qapi-events-run-state.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
+#include "exec/translation-block.h"
 #include "system/runstate.h"
 #ifndef CONFIG_USER_ONLY
 #include "system/hw_accel.h"

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index fa838dce2e433546ff154002db7af8a54603f511..f5bc8720d1fc1b28950ee02de5ae6cce86fc6a96 100644 (file)
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -15,6 +15,7 @@
 #include "system/kvm.h"
 #include "kvm/kvm_loongarch.h"
 #include "exec/exec-all.h"
+#include "exec/translation-block.h"
 #include "cpu.h"
 #include "internals.h"
 #include "fpu/softfloat-helpers.h"

diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c
index 0e41e39c0e22b0aed845a79f2bb9a8003ce596ec..9db5c4d2a3570489e36cb8e5b83488875419b698 100644 (file)
--- a/target/microblaze/cpu.c
+++ b/target/microblaze/cpu.c
@@ -30,6 +30,7 @@
 #include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "exec/gdbstub.h"
+#include "exec/translation-block.h"
 #include "fpu/softfloat-helpers.h"
 #include "tcg/tcg.h"
 

diff --git a/target/mips/tcg/exception.c b/target/mips/tcg/exception.c
index 4886d087b2ed60eab1f7b760e7a0f889de682d7a..1a8902ea1bc0d537193b9ecfc4f2fa4524c0c716 100644 (file)
--- a/target/mips/tcg/exception.c
+++ b/target/mips/tcg/exception.c
@@ -24,6 +24,7 @@
 #include "internal.h"
 #include "exec/helper-proto.h"
 #include "exec/exec-all.h"
+#include "exec/translation-block.h"
 
 target_ulong exception_resume_pc(CPUMIPSState *env)
 {

diff --git a/target/mips/tcg/system/special_helper.c b/target/mips/tcg/system/special_helper.c
index 9ce5e2ceac5c9561002a3b959218b1e89aa5b60d..3ce3ae1e124297d01b69b22f57e5ad50dfcfbfb2 100644 (file)
--- a/target/mips/tcg/system/special_helper.c
+++ b/target/mips/tcg/system/special_helper.c
@@ -23,6 +23,7 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "exec/exec-all.h"
+#include "exec/translation-block.h"
 #include "internal.h"
 
 /* Specials */

diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c
index 3ccf85e95f054650e9a5bb87913237180e2025ce..7913a0c3e11230c75931b224e943a476a356ec8f 100644 (file)
--- a/target/openrisc/cpu.c
+++ b/target/openrisc/cpu.c
@@ -22,6 +22,7 @@
 #include "qemu/qemu-print.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
+#include "exec/translation-block.h"
 #include "fpu/softfloat-helpers.h"
 #include "tcg/tcg.h"
 

diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c
index c62c2216961bc65e23142f8683aa0f3b0a68fdb3..958b8c89cbf5e0e034a3b6d37e4b5c1bc96fee3f 100644 (file)
--- a/target/riscv/tcg/tcg-cpu.c
+++ b/target/riscv/tcg/tcg-cpu.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "exec/exec-all.h"
+#include "exec/translation-block.h"
 #include "tcg-cpu.h"
 #include "cpu.h"
 #include "internals.h"

diff --git a/target/rx/cpu.c b/target/rx/cpu.c
index 69ec0bc7b3dfbb6623771249cc191f7bb8bd4f3f..558280c79451c040419cbb2b3531101e09816217 100644 (file)
--- a/target/rx/cpu.c
+++ b/target/rx/cpu.c
@@ -23,6 +23,7 @@
 #include "migration/vmstate.h"
 #include "exec/exec-all.h"
 #include "exec/page-protection.h"
+#include "exec/translation-block.h"
 #include "hw/loader.h"
 #include "fpu/softfloat.h"
 #include "tcg/debug-assert.h"

diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c
index d5008859b8e654da4b83f707122a410b0d238baf..e9d3e12a62ca68ca0d709a3858f969fb8c36feac 100644 (file)
--- a/target/sh4/cpu.c
+++ b/target/sh4/cpu.c
@@ -25,6 +25,7 @@
 #include "cpu.h"
 #include "migration/vmstate.h"
 #include "exec/exec-all.h"
+#include "exec/translation-block.h"
 #include "fpu/softfloat-helpers.h"
 #include "tcg/tcg.h"
 

diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index fc0c66afecf205c42dc1b882c1f7b9195fcc241d..960ed9035138e0a676009bf3058f9ca190a797d1 100644 (file)
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -23,6 +23,7 @@
 #include "qemu/module.h"
 #include "qemu/qemu-print.h"
 #include "exec/exec-all.h"
+#include "exec/translation-block.h"
 #include "hw/qdev-properties.h"
 #include "qapi/visitor.h"
 #include "tcg/tcg.h"

diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c
index 1a261715907da35453d777224f1d1b8bfa0d7614..95fb546666f7adf36ef011b9c062214926de284b 100644 (file)
--- a/target/tricore/cpu.c
+++ b/target/tricore/cpu.c
@@ -21,6 +21,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
+#include "exec/translation-block.h"
 #include "qemu/error-report.h"
 #include "tcg/debug-assert.h"