Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
target/arm/helper-sve.h | 14 ++++++++++++++
target/arm/helper.h | 1 -
target/arm/tcg/{helper-sve.h => helper-sve-defs.h} | 0
target/arm/tcg/gengvec64.c | 3 ++-
target/arm/tcg/sve_helper.c | 3 +++
target/arm/tcg/translate-a64.c | 1 +
target/arm/tcg/translate-sme.c | 2 ++
target/arm/tcg/translate-sve.c | 2 ++
target/arm/tcg/vec_helper.c | 1 +
9 files changed, 25 insertions(+), 2 deletions(-)
create mode 100644 target/arm/helper-sve.h
rename target/arm/tcg/{helper-sve.h => helper-sve-defs.h} (100%)
diff --git a/target/arm/helper-sve.h b/target/arm/helper-sve.h
new file mode 100644
index 00000000000..ae4f46c70a0
--- /dev/null
+++ b/target/arm/helper-sve.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef HELPER_SVE_H
+#define HELPER_SVE_H
+
+#include "exec/helper-proto-common.h"
+#include "exec/helper-gen-common.h"
+
+#define HELPER_H "tcg/helper-sve-defs.h"
+#include "exec/helper-proto.h.inc"
+#include "exec/helper-gen.h.inc"
+#undef HELPER_H
+
+#endif /* HELPER_SVE_H */
diff --git a/target/arm/helper.h b/target/arm/helper.h
index 79f8de1e169..2f724643d39 100644
--- a/target/arm/helper.h
+++ b/target/arm/helper.h
@@ -3,6 +3,5 @@
#include "tcg/helper.h"
#ifdef TARGET_AARCH64
-#include "tcg/helper-sve.h"
#include "tcg/helper-sme.h"
#endif
diff --git a/target/arm/tcg/helper-sve.h b/target/arm/tcg/helper-sve-defs.h
similarity index 100%
rename from target/arm/tcg/helper-sve.h
rename to target/arm/tcg/helper-sve-defs.h
diff --git a/target/arm/tcg/gengvec64.c b/target/arm/tcg/gengvec64.c
index c425d2b1490..c7bdd1ea82f 100644
--- a/target/arm/tcg/gengvec64.c
+++ b/target/arm/tcg/gengvec64.c
@@ -18,10 +18,11 @@
*/
#include "qemu/osdep.h"
+#include "cpu.h"
+#include "helper-sve.h"
#include "translate.h"
#include "translate-a64.h"
-
static void gen_rax1_i64(TCGv_i64 d, TCGv_i64 n, TCGv_i64 m)
{
tcg_gen_rotli_i64(d, m, 1);
diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c
index 0600eea47c7..16e528e41a6 100644
--- a/target/arm/tcg/sve_helper.c
+++ b/target/arm/tcg/sve_helper.c
@@ -25,6 +25,7 @@
#include "exec/target_page.h"
#include "exec/tlb-flags.h"
#include "helper-a64.h"
+#include "helper-sve.h"
#include "tcg/tcg-gvec-desc.h"
#include "fpu/softfloat.h"
#include "tcg/tcg.h"
@@ -38,6 +39,8 @@
#include "user/page-protection.h"
#endif
+#define HELPER_H "tcg/helper-sve-defs.h"
+#include "exec/helper-info.c.inc"
/* Return a value for NZCV as per the ARM PredTest pseudofunction.
*
diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c
index 1a54337b6a8..31fb2ea9cc3 100644
--- a/target/arm/tcg/translate-a64.c
+++ b/target/arm/tcg/translate-a64.c
@@ -19,6 +19,7 @@
#include "qemu/osdep.h"
#include "exec/target_page.h"
#include "helper-a64.h"
+#include "helper-sve.h"
#include "translate.h"
#include "translate-a64.h"
#include "qemu/log.h"
diff --git a/target/arm/tcg/translate-sme.c b/target/arm/tcg/translate-sme.c
index 091c56da4f4..463ece97ab8 100644
--- a/target/arm/tcg/translate-sme.c
+++ b/target/arm/tcg/translate-sme.c
@@ -18,6 +18,8 @@
*/
#include "qemu/osdep.h"
+#include "cpu.h"
+#include "helper-sve.h"
#include "translate.h"
#include "translate-a64.h"
diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c
index 64adb5c1ce3..c68a44aff8c 100644
--- a/target/arm/tcg/translate-sve.c
+++ b/target/arm/tcg/translate-sve.c
@@ -18,6 +18,8 @@
*/
#include "qemu/osdep.h"
+#include "cpu.h"
+#include "helper-sve.h"
#include "translate.h"
#include "translate-a64.h"
#include "fpu/softfloat.h"
diff --git a/target/arm/tcg/vec_helper.c b/target/arm/tcg/vec_helper.c
index 7451a283efa..bc64c8ff374 100644
--- a/target/arm/tcg/vec_helper.c
+++ b/target/arm/tcg/vec_helper.c
@@ -21,6 +21,7 @@
#include "cpu.h"
#include "exec/helper-proto.h"
#include "helper-a64.h"
+#include "helper-sve.h"
#include "tcg/tcg-gvec-desc.h"
#include "fpu/softfloat.h"
#include "qemu/int128.h"
--
2.47.3