[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 18/26] target/arm/tcg: Reduce 'helper-sme.h.inc' inclusion
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 18/26] target/arm/tcg: Reduce 'helper-sme.h.inc' inclusion |
Date: |
Sun, 11 Jun 2023 10:58:38 +0200 |
Instead of including helper-sme.h.inc via helper.h which
is included by all TCG files, restrict it to the few files
that require it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/arm/helper.h | 1 -
target/arm/tcg/sme_helper.c | 5 ++++-
target/arm/tcg/translate-a64.c | 4 ++++
target/arm/tcg/translate-sme.c | 6 ++++++
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/target/arm/helper.h b/target/arm/helper.h
index 61cd8fd21e..b7201eb89c 100644
--- a/target/arm/helper.h
+++ b/target/arm/helper.h
@@ -539,5 +539,4 @@ DEF_HELPER_FLAGS_5(gvec_uclamp_d, TCG_CALL_NO_RWG,
#ifdef TARGET_AARCH64
#include "tcg/helper-a64.h.inc"
-#include "tcg/helper-sme.h.inc"
#endif
diff --git a/target/arm/tcg/sme_helper.c b/target/arm/tcg/sme_helper.c
index 1e67fcac30..04170ad18d 100644
--- a/target/arm/tcg/sme_helper.c
+++ b/target/arm/tcg/sme_helper.c
@@ -21,7 +21,6 @@
#include "cpu.h"
#include "internals.h"
#include "tcg/tcg-gvec-desc.h"
-#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
#include "exec/exec-all.h"
#include "qemu/int128.h"
@@ -29,6 +28,10 @@
#include "vec_internal.h"
#include "sve_ldst_internal.h"
+#define HELPER_H "tcg/helper-sme.h.inc"
+#include "exec/helper-proto.h.inc"
+#undef HELPER_H
+
void helper_set_svcr(CPUARMState *env, uint32_t val, uint32_t mask)
{
aarch64_set_svcr(env, val, mask);
diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c
index 22caf89bb0..d1ab1edf6d 100644
--- a/target/arm/tcg/translate-a64.c
+++ b/target/arm/tcg/translate-a64.c
@@ -34,6 +34,10 @@
#include "exec/helper-gen.h.inc"
#undef HELPER_H
+#define HELPER_H "tcg/helper-sme.h.inc"
+#include "exec/helper-gen.h.inc"
+#undef HELPER_H
+
static TCGv_i64 cpu_X[32];
static TCGv_i64 cpu_pc;
diff --git a/target/arm/tcg/translate-sme.c b/target/arm/tcg/translate-sme.c
index e63b9883a9..fa0dc20bf2 100644
--- a/target/arm/tcg/translate-sme.c
+++ b/target/arm/tcg/translate-sme.c
@@ -29,6 +29,12 @@
#include "exec/helper-gen.h.inc"
#undef HELPER_H
+#define HELPER_H "tcg/helper-sme.h.inc"
+#include "exec/helper-proto.h.inc"
+#include "exec/helper-gen.h.inc"
+#include "exec/helper-info.c.inc"
+#undef HELPER_H
+
/*
* Include the generated decoder.
*/
--
2.38.1
- [PATCH v2 07/26] target/arm/tcg: Expose some iwmmxt methods in 'translate.h', (continued)
- [PATCH v2 07/26] target/arm/tcg: Expose some iwmmxt methods in 'translate.h', Philippe Mathieu-Daudé, 2023/06/11
- [PATCH v2 08/26] target/arm/tcg: Extract iwmmxt code to translate-iwmmxt.c, Philippe Mathieu-Daudé, 2023/06/11
- [PATCH v2 09/26] target/arm/tcg: Reduce 'helper-iwmmxt.h.inc' inclusion, Philippe Mathieu-Daudé, 2023/06/11
- [PATCH v2 10/26] target/arm/tcg: Extract VFP definitions to 'helper-vfp.h.inc', Philippe Mathieu-Daudé, 2023/06/11
- [PATCH v2 11/26] target/arm/tcg: Reduce 'helper-vfp.h.inc' inclusion, Philippe Mathieu-Daudé, 2023/06/11
- [PATCH v2 12/26] target/arm/tcg: Move neon_tbl() from op_helper.c to neon_helper.c, Philippe Mathieu-Daudé, 2023/06/11
- [PATCH v2 16/26] target/arm/tcg: Reduce 'helper-sve.h.inc' inclusion, Philippe Mathieu-Daudé, 2023/06/11
- [PATCH v2 18/26] target/arm/tcg: Reduce 'helper-sme.h.inc' inclusion,
Philippe Mathieu-Daudé <=
- [PATCH v2 13/26] target/arm/tcg: Extract NEON definitions to 'helper-neon.h.inc', Philippe Mathieu-Daudé, 2023/06/11
- [PATCH v2 19/26] target/arm/tcg: Reduce 'helper-a64.h.inc' inclusion, Philippe Mathieu-Daudé, 2023/06/11
- [PATCH v2 14/26] target/arm/tcg: Reduce 'helper-neon.h.inc' inclusion, Philippe Mathieu-Daudé, 2023/06/11
- [PATCH v2 20/26] target/arm/tcg: Move v8m_stackcheck() from op_helper.c to m_helper.c, Philippe Mathieu-Daudé, 2023/06/11
- [PATCH v2 21/26] target/arm/tcg: Extract M-profile definitions to 'helper-m.h.inc', Philippe Mathieu-Daudé, 2023/06/11