[v3,37/48] target/arm: Tidy helpers for translation

Message ID	20230531040330.8950-38-richard.henderson@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Subject: [PATCH v3 37/48] target/arm: Tidy helpers for translation Date: Tue, 30 May 2023 21:03:19 -0700 Message-Id: <20230531040330.8950-38-richard.henderson@linaro.org> In-Reply-To: <20230531040330.8950-1-richard.henderson@linaro.org> References: <20230531040330.8950-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::131; envelope-from=richard.henderson@linaro.org; helo=mail-il1-x131.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action Precedence: list Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org
Series	tcg: Build once for system, once for user \| expand [v3,00/48] tcg: Build once for system, once for user [v3,01/48] tcg/ppc: Remove TARGET_LONG_BITS, TCG_TYPE_TL [v3,02/48] tcg/riscv: Remove TARGET_LONG_BITS, TCG_TYPE_TL [v3,03/48] tcg/s390x: Remove TARGET_LONG_BITS, TCG_TYPE_TL [v3,04/48] tcg/sparc64: Remove TARGET_LONG_BITS, TCG_TYPE_TL [v3,05/48] tcg: Move TCG_TYPE_TL from tcg.h to tcg-op.h [v3,06/48] tcg: Widen CPUTLBEntry comparators to 64-bits [v3,07/48] tcg: Add tlb_fast_offset to TCGContext [v3,08/48] : Add missing includes of qemu/error-report.h [v3,09/48] : Add missing includes of tcg/debug-assert.h [v3,10/48] : Add missing includes of tcg/tcg.h [v3,11/48] tcg: Split out tcg-target-reg-bits.h [v3,12/48] target/arm: Fix test of TCG_OVERSIZED_GUEST [v3,13/48] tcg: Split out tcg/oversized-guest.h [v3,14/48] tcg: Move TCGv, dup_const_tl definitions to tcg-op.h [v3,15/48] tcg: Split tcg/tcg-op-common.h from tcg/tcg-op.h [v3,16/48] target/arm: Include helper-gen.h in translator.h [v3,17/48] target/hexagon: Include helper-gen.h where needed [v3,18/48] tcg: Remove outdated comments in helper-head.h [v3,19/48] tcg: Move TCGHelperInfo and dependencies to tcg/helper-info.h [v3,20/48] tcg: Pass TCGHelperInfo to tcg_gen_callN [v3,21/48] tcg: Move temp_idx and tcgv_i32_temp debug out of line [v3,22/48] tcg: Split tcg_gen_callN [v3,23/48] tcg: Split helper-gen.h [v3,24/48] tcg: Split helper-proto.h [v3,25/48] tcg: Add insn_start_words to TCGContext [v3,26/48] tcg: Add guest_mo to TCGContext [v3,27/48] tcg: Move TLB_FLAGS_MASK check out of get_alignment_bits [v3,28/48] tcg: Split tcg/tcg-op-gvec.h [v3,29/48] tcg: Remove NO_CPU_IO_DEFS [v3,30/48] exec-all: Widen tb_page_addr_t for user-only [v3,31/48] exec-all: Widen TranslationBlock pc and cs_base to 64-bits [v3,32/48] tcg: Spit out exec/translation-block.h [v3,33/48] include/exec: Remove CODE_GEN_AVG_BLOCK_SIZE [v3,34/48] accel/tcg: Move most of gen-icount.h into translator.c [v3,35/48] accel/tcg: Introduce translator_io_start [v3,36/48] accel/tcg: Move translator_fake_ldb out of line [v3,37/48] target/arm: Tidy helpers for translation [v3,38/48] target/mips: Tidy helpers for translation [v3,39/48] : Add missing includes of exec/translation-block.h [v3,40/48] *: Add missing includes of exec/exec-all.h [v3,41/48] accel/tcg: Tidy includes for translator.[ch] [v3,42/48] tcg: Fix PAGE/PROT confusion [v3,43/48] tcg: Move env defines out of NEED_CPU_H in helper-head.h [v3,44/48] tcg: Remove target-specific headers from tcg.[ch] [v3,45/48] plugins: Move plugin_insn_append to translator.c [v3,46/48] plugins: Drop unused headers from exec/plugin-gen.h [v3,47/48] exec/poison: Do not poison CONFIG_SOFTMMU [v3,48/48] tcg: Build once for system and once for user-only

Message ID

20230531040330.8950-38-richard.henderson@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: domain of
 qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as
 permitted sender) client-ip=209.51.188.17;
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v3 37/48] target/arm: Tidy helpers for translation
Date: Tue, 30 May 2023 21:03:19 -0700
Message-Id: <20230531040330.8950-38-richard.henderson@linaro.org>
In-Reply-To: <20230531040330.8950-1-richard.henderson@linaro.org>
References: <20230531040330.8950-1-richard.henderson@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::131;
 envelope-from=richard.henderson@linaro.org; helo=mail-il1-x131.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
 T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org

Series

tcg: Build once for system, once for user | expand

Commit Message

Richard Henderson May 31, 2023, 4:03 a.m. UTC

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.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/arm/tcg/translate.h        |  3 +++
 target/arm/tcg/translate-a64.c    | 17 +++++------------
 target/arm/tcg/translate-m-nocp.c |  2 --
 target/arm/tcg/translate-mve.c    |  3 ---
 target/arm/tcg/translate-neon.c   |  3 ---
 target/arm/tcg/translate-sme.c    |  6 ------
 target/arm/tcg/translate-sve.c    |  9 ---------
 target/arm/tcg/translate-vfp.c    |  3 ---
 target/arm/tcg/translate.c        | 17 +++++------------
 9 files changed, 13 insertions(+), 50 deletions(-)

Comments

Philippe Mathieu-Daudé May 31, 2023, 5:23 a.m. UTC | #1

On 31/5/23 06:03, Richard Henderson wrote:
> 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.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   target/arm/tcg/translate.h        |  3 +++
>   target/arm/tcg/translate-a64.c    | 17 +++++------------
>   target/arm/tcg/translate-m-nocp.c |  2 --
>   target/arm/tcg/translate-mve.c    |  3 ---
>   target/arm/tcg/translate-neon.c   |  3 ---
>   target/arm/tcg/translate-sme.c    |  6 ------
>   target/arm/tcg/translate-sve.c    |  9 ---------
>   target/arm/tcg/translate-vfp.c    |  3 ---
>   target/arm/tcg/translate.c        | 17 +++++------------
>   9 files changed, 13 insertions(+), 50 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h
index 868a3abd0d..5b53b6215d 100644
--- a/target/arm/tcg/translate.h
+++ b/target/arm/tcg/translate.h
@@ -1,6 +1,9 @@ 
 #ifndef TARGET_ARM_TRANSLATE_H
 #define TARGET_ARM_TRANSLATE_H
 
+#include "cpu.h"
+#include "tcg/tcg-op.h"
+#include "tcg/tcg-op-gvec.h"
 #include "exec/translator.h"
 #include "exec/helper-gen.h"
 #include "internals.h"
diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c
index 8d45dbf8fc..d9800337cf 100644
--- a/target/arm/tcg/translate-a64.c
+++ b/target/arm/tcg/translate-a64.c
@@ -18,20 +18,13 @@ 
  */
 #include "qemu/osdep.h"
 
-#include "cpu.h"
-#include "exec/exec-all.h"
-#include "tcg/tcg-op.h"
-#include "tcg/tcg-op-gvec.h"
-#include "qemu/log.h"
-#include "arm_ldst.h"
 #include "translate.h"
-#include "internals.h"
-#include "qemu/host-utils.h"
-#include "semihosting/semihost.h"
-#include "exec/log.h"
-#include "cpregs.h"
 #include "translate-a64.h"
-#include "qemu/atomic128.h"
+#include "qemu/log.h"
+#include "disas/disas.h"
+#include "arm_ldst.h"
+#include "semihosting/semihost.h"
+#include "cpregs.h"
 
 static TCGv_i64 cpu_X[32];
 static TCGv_i64 cpu_pc;
diff --git a/target/arm/tcg/translate-m-nocp.c b/target/arm/tcg/translate-m-nocp.c
index 9a89aab785..33f6478bb9 100644
--- a/target/arm/tcg/translate-m-nocp.c
+++ b/target/arm/tcg/translate-m-nocp.c
@@ -18,8 +18,6 @@ 
  */
 
 #include "qemu/osdep.h"
-#include "tcg/tcg-op.h"
-#include "tcg/tcg-op-gvec.h"
 #include "translate.h"
 #include "translate-a32.h"
 
diff --git a/target/arm/tcg/translate-mve.c b/target/arm/tcg/translate-mve.c
index 2ad3c40975..bbc7b3f4ce 100644
--- a/target/arm/tcg/translate-mve.c
+++ b/target/arm/tcg/translate-mve.c
@@ -18,9 +18,6 @@ 
  */
 
 #include "qemu/osdep.h"
-#include "tcg/tcg-op.h"
-#include "tcg/tcg-op-gvec.h"
-#include "exec/exec-all.h"
 #include "translate.h"
 #include "translate-a32.h"
 
diff --git a/target/arm/tcg/translate-neon.c b/target/arm/tcg/translate-neon.c
index 6fac577abd..03913de047 100644
--- a/target/arm/tcg/translate-neon.c
+++ b/target/arm/tcg/translate-neon.c
@@ -21,9 +21,6 @@ 
  */
 
 #include "qemu/osdep.h"
-#include "tcg/tcg-op.h"
-#include "tcg/tcg-op-gvec.h"
-#include "exec/exec-all.h"
 #include "translate.h"
 #include "translate-a32.h"
 
diff --git a/target/arm/tcg/translate-sme.c b/target/arm/tcg/translate-sme.c
index b0812d9dd6..d0054e3f77 100644
--- a/target/arm/tcg/translate-sme.c
+++ b/target/arm/tcg/translate-sme.c
@@ -18,14 +18,8 @@ 
  */
 
 #include "qemu/osdep.h"
-#include "cpu.h"
-#include "tcg/tcg-op.h"
-#include "tcg/tcg-op-gvec.h"
-#include "tcg/tcg-gvec-desc.h"
 #include "translate.h"
 #include "translate-a64.h"
-#include "fpu/softfloat.h"
-
 
 /*
  * Include the generated decoder.
diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c
index 106baf311f..d9d5810dde 100644
--- a/target/arm/tcg/translate-sve.c
+++ b/target/arm/tcg/translate-sve.c
@@ -18,16 +18,7 @@ 
  */
 
 #include "qemu/osdep.h"
-#include "cpu.h"
-#include "exec/exec-all.h"
-#include "tcg/tcg-op.h"
-#include "tcg/tcg-op-gvec.h"
-#include "tcg/tcg-gvec-desc.h"
-#include "qemu/log.h"
-#include "arm_ldst.h"
 #include "translate.h"
-#include "internals.h"
-#include "exec/log.h"
 #include "translate-a64.h"
 #include "fpu/softfloat.h"
 
diff --git a/target/arm/tcg/translate-vfp.c b/target/arm/tcg/translate-vfp.c
index 95ac8d9db3..359b1e3e96 100644
--- a/target/arm/tcg/translate-vfp.c
+++ b/target/arm/tcg/translate-vfp.c
@@ -21,9 +21,6 @@ 
  */
 
 #include "qemu/osdep.h"
-#include "tcg/tcg-op.h"
-#include "tcg/tcg-op-gvec.h"
-#include "exec/exec-all.h"
 #include "translate.h"
 #include "translate-a32.h"
 
diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c
index 7caf6d802d..a68d3c7f6d 100644
--- a/target/arm/tcg/translate.c
+++ b/target/arm/tcg/translate.c
@@ -20,20 +20,13 @@ 
  */
 #include "qemu/osdep.h"
 
-#include "cpu.h"
-#include "internals.h"
-#include "disas/disas.h"
-#include "exec/exec-all.h"
-#include "tcg/tcg-op.h"
-#include "tcg/tcg-op-gvec.h"
-#include "qemu/log.h"
-#include "qemu/bitops.h"
-#include "arm_ldst.h"
-#include "semihosting/semihost.h"
-#include "exec/log.h"
-#include "cpregs.h"
 #include "translate.h"
 #include "translate-a32.h"
+#include "qemu/log.h"
+#include "disas/disas.h"
+#include "arm_ldst.h"
+#include "semihosting/semihost.h"
+#include "cpregs.h"
 #include "exec/helper-proto.h"
 
 #define HELPER_H "helper.h"

[v3,37/48] target/arm: Tidy helpers for translation

Commit Message

Comments

Patch