[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 40/52] target/mips: Tidy helpers for translation
From: |
Richard Henderson |
Subject: |
[PULL 40/52] target/mips: Tidy helpers for translation |
Date: |
Mon, 5 Jun 2023 13:15:36 -0700 |
Move most includes from *translate*.c to translate.h, ensuring
that we get the ordering correct. Ensure cpu.h is first.
Use disas/disas.h instead of exec/log.h.
Drop otherwise unused includes.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/mips/tcg/translate.h | 6 ++++--
target/mips/tcg/msa_translate.c | 3 ---
target/mips/tcg/mxu_translate.c | 2 --
target/mips/tcg/octeon_translate.c | 4 +---
target/mips/tcg/rel6_translate.c | 2 --
target/mips/tcg/translate.c | 18 ++++++------------
target/mips/tcg/translate_addr_const.c | 1 -
target/mips/tcg/tx79_translate.c | 4 +---
target/mips/tcg/vr54xx_translate.c | 3 ---
9 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/target/mips/tcg/translate.h b/target/mips/tcg/translate.h
index fa8bf55209..3b0498a47a 100644
--- a/target/mips/tcg/translate.h
+++ b/target/mips/tcg/translate.h
@@ -8,9 +8,11 @@
#ifndef TARGET_MIPS_TRANSLATE_H
#define TARGET_MIPS_TRANSLATE_H
-#include "qemu/log.h"
-#include "exec/translator.h"
+#include "cpu.h"
#include "tcg/tcg-op.h"
+#include "exec/translator.h"
+#include "exec/helper-gen.h"
+#include "qemu/log.h"
#define MIPS_DEBUG_DISAS 0
diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translate.c
index 220cd3b048..b5b66fb38a 100644
--- a/target/mips/tcg/msa_translate.c
+++ b/target/mips/tcg/msa_translate.c
@@ -11,11 +11,8 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
#include "qemu/osdep.h"
-#include "tcg/tcg-op.h"
-#include "exec/helper-gen.h"
#include "translate.h"
#include "fpu_helper.h"
-#include "internal.h"
static int elm_n(DisasContext *ctx, int x);
static int elm_df(DisasContext *ctx, int x);
diff --git a/target/mips/tcg/mxu_translate.c b/target/mips/tcg/mxu_translate.c
index be038b5f07..39348b3a91 100644
--- a/target/mips/tcg/mxu_translate.c
+++ b/target/mips/tcg/mxu_translate.c
@@ -16,8 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "tcg/tcg-op.h"
-#include "exec/helper-gen.h"
#include "translate.h"
/*
diff --git a/target/mips/tcg/octeon_translate.c
b/target/mips/tcg/octeon_translate.c
index 103c304d10..e25c4cbaa0 100644
--- a/target/mips/tcg/octeon_translate.c
+++ b/target/mips/tcg/octeon_translate.c
@@ -7,10 +7,8 @@
*/
#include "qemu/osdep.h"
-#include "tcg/tcg-op.h"
-#include "tcg/tcg-op-gvec.h"
-#include "exec/helper-gen.h"
#include "translate.h"
+#include "tcg/tcg-op-gvec.h"
/* Include the auto-generated decoder. */
#include "decode-octeon.c.inc"
diff --git a/target/mips/tcg/rel6_translate.c b/target/mips/tcg/rel6_translate.c
index d631851258..59f237ba3b 100644
--- a/target/mips/tcg/rel6_translate.c
+++ b/target/mips/tcg/rel6_translate.c
@@ -9,8 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "tcg/tcg-op.h"
-#include "exec/helper-gen.h"
#include "translate.h"
/* Include the auto-generated decoders. */
diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c
index 312ed66989..f3da05ba3b 100644
--- a/target/mips/tcg/translate.c
+++ b/target/mips/tcg/translate.c
@@ -23,19 +23,13 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
-#include "internal.h"
-#include "tcg/tcg-op.h"
-#include "exec/translator.h"
-#include "exec/helper-proto.h"
-#include "exec/helper-gen.h"
-#include "semihosting/semihost.h"
-
-#include "trace.h"
-#include "exec/log.h"
-#include "qemu/qemu-print.h"
-#include "fpu_helper.h"
#include "translate.h"
+#include "internal.h"
+#include "exec/helper-proto.h"
+#include "semihosting/semihost.h"
+#include "trace.h"
+#include "disas/disas.h"
+#include "fpu_helper.h"
#define HELPER_H "helper.h"
#include "exec/helper-info.c.inc"
diff --git a/target/mips/tcg/translate_addr_const.c
b/target/mips/tcg/translate_addr_const.c
index a510da406c..6f4b39f715 100644
--- a/target/mips/tcg/translate_addr_const.c
+++ b/target/mips/tcg/translate_addr_const.c
@@ -11,7 +11,6 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
#include "qemu/osdep.h"
-#include "tcg/tcg-op.h"
#include "translate.h"
bool gen_lsa(DisasContext *ctx, int rd, int rt, int rs, int sa)
diff --git a/target/mips/tcg/tx79_translate.c b/target/mips/tcg/tx79_translate.c
index 3a45a1bfea..dd6fb8a7bd 100644
--- a/target/mips/tcg/tx79_translate.c
+++ b/target/mips/tcg/tx79_translate.c
@@ -8,10 +8,8 @@
*/
#include "qemu/osdep.h"
-#include "tcg/tcg-op.h"
-#include "tcg/tcg-op-gvec.h"
-#include "exec/helper-gen.h"
#include "translate.h"
+#include "tcg/tcg-op-gvec.h"
/* Include the auto-generated decoder. */
#include "decode-tx79.c.inc"
diff --git a/target/mips/tcg/vr54xx_translate.c
b/target/mips/tcg/vr54xx_translate.c
index 804672f84c..2c1f6cc527 100644
--- a/target/mips/tcg/vr54xx_translate.c
+++ b/target/mips/tcg/vr54xx_translate.c
@@ -10,10 +10,7 @@
*/
#include "qemu/osdep.h"
-#include "tcg/tcg-op.h"
-#include "exec/helper-gen.h"
#include "translate.h"
-#include "internal.h"
/* Include the auto-generated decoder. */
#include "decode-vr54xx.c.inc"
--
2.34.1
- [PULL 34/52] include/exec: Remove CODE_GEN_AVG_BLOCK_SIZE, (continued)
- [PULL 34/52] include/exec: Remove CODE_GEN_AVG_BLOCK_SIZE, Richard Henderson, 2023/06/05
- [PULL 39/52] target/arm: Tidy helpers for translation, Richard Henderson, 2023/06/05
- [PULL 38/52] accel/tcg: Move translator_fake_ldb out of line, Richard Henderson, 2023/06/05
- [PULL 20/52] tcg: Pass TCGHelperInfo to tcg_gen_callN, Richard Henderson, 2023/06/05
- [PULL 22/52] tcg: Split tcg_gen_callN, Richard Henderson, 2023/06/05
- [PULL 36/52] accel/tcg: Introduce translator_io_start, Richard Henderson, 2023/06/05
- [PULL 37/52] target/ppc: Inline gen_icount_io_start(), Richard Henderson, 2023/06/05
- [PULL 42/52] target/arm: Add missing include of exec/exec-all.h, Richard Henderson, 2023/06/05
- [PULL 44/52] tcg: Fix PAGE/PROT confusion, Richard Henderson, 2023/06/05
- [PULL 45/52] tcg: Move env defines out of NEED_CPU_H in helper-head.h, Richard Henderson, 2023/06/05
- [PULL 40/52] target/mips: Tidy helpers for translation,
Richard Henderson <=
- [PULL 41/52] target/*: Add missing includes of exec/translation-block.h, Richard Henderson, 2023/06/05
- [PULL 43/52] accel/tcg: Tidy includes for translator.[ch], Richard Henderson, 2023/06/05
- [PULL 46/52] tcg: Remove target-specific headers from tcg.[ch], Richard Henderson, 2023/06/05
- [PULL 47/52] plugins: Move plugin_insn_append to translator.c, Richard Henderson, 2023/06/05
- [PULL 49/52] exec/poison: Do not poison CONFIG_SOFTMMU, Richard Henderson, 2023/06/05
- [PULL 50/52] tcg: Build once for system and once for user-only, Richard Henderson, 2023/06/05
- [PULL 52/52] tcg/tcg-op-vec: Remove left over _link_error() definitions, Richard Henderson, 2023/06/05
- [PULL 48/52] plugins: Drop unused headers from exec/plugin-gen.h, Richard Henderson, 2023/06/05