target/s390x: start moving TCG-only code to tcg/

move everything related to translate, as well as HELPER code in tcg/

mmu_helper.c stays put for now, as it contains both TCG and KVM code.

After the reshuffling, update MAINTAINERS accordingly.
Make use of the new directory:

target/s390x/tcg/

Signed-off-by: Claudio Fontana <cfontana@suse.de>
Signed-off-by: Cho, Yu-Chen <acho@suse.com>
Acked-by: David Hildenbrand <david@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210707105324.23400-8-acho@suse.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 684142e12eaaa059b716c76cf20568778db51175..8ec845f4e0d811f9cb41de86149632447cff268c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -297,6 +297,7 @@ M: Richard Henderson <richard.henderson@linaro.org>
 M: David Hildenbrand <david@redhat.com>
 S: Maintained
 F: target/s390x/
+F: target/s390x/tcg
 F: hw/s390x/
 F: disas/s390.c
 F: tests/tcg/s390x/

diff --git a/hw/s390x/tod-tcg.c b/hw/s390x/tod-tcg.c
index aa44deb809fa86e1e1b0e03d5f6d74bee34ce233..9bb94ff72bc09c7cafd344b95464713a8275d937 100644 (file)
--- a/hw/s390x/tod-tcg.c
+++ b/hw/s390x/tod-tcg.c
@@ -16,7 +16,7 @@
 #include "qemu/cutils.h"
 #include "qemu/module.h"
 #include "cpu.h"
-#include "tcg_s390x.h"
+#include "tcg/tcg_s390x.h"
 
 static void qemu_s390_tod_get(const S390TODState *td, S390TOD *tod,
                               Error **errp)

diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h
index ff3195a4bf8a584f2c25a0758570d437ddd02708..0935e850891014fa247c6788ea23908428ce31ac 100644 (file)
--- a/include/hw/s390x/tod.h
+++ b/include/hw/s390x/tod.h
@@ -12,7 +12,7 @@
 #define HW_S390_TOD_H
 
 #include "hw/qdev-core.h"
-#include "target/s390x/s390-tod.h"
+#include "tcg/s390-tod.h"
 #include "qom/object.h"
 
 typedef struct S390TOD {

diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c
index 3fde18ba464812852a7aa0388fb134850812de47..734f0c62de6e06916d3ea82ce792f358e29ef1f8 100644 (file)
--- a/target/s390x/interrupt.c
+++ b/target/s390x/interrupt.c
@@ -15,7 +15,7 @@
 #include "sysemu/kvm.h"
 #include "sysemu/tcg.h"
 #include "hw/s390x/ioinst.h"
-#include "tcg_s390x.h"
+#include "tcg/tcg_s390x.h"
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/s390x/s390_flic.h"
 #endif

diff --git a/target/s390x/machine.c b/target/s390x/machine.c
index 4f11f6ac6ec41dd8de67639f9817cd312d115639..81a8a7ff9923590da66a8d9bf6e6c20eb01835a7 100644 (file)
--- a/target/s390x/machine.c
+++ b/target/s390x/machine.c
@@ -19,7 +19,7 @@
 #include "s390x-internal.h"
 #include "kvm_s390x.h"
 #include "migration/vmstate.h"
-#include "tcg_s390x.h"
+#include "tcg/tcg_s390x.h"
 #include "sysemu/kvm.h"
 #include "sysemu/tcg.h"
 

diff --git a/target/s390x/meson.build b/target/s390x/meson.build
index a5e1ded93f42d8f7bea892299a29f3f7fd1c1059..60d7f1b90895416613c1425bf7a4ccf5291ef90a 100644 (file)
--- a/target/s390x/meson.build
+++ b/target/s390x/meson.build
@@ -8,21 +8,6 @@ s390x_ss.add(files(
   'interrupt.c',
 ))
 
-s390x_ss.add(when: 'CONFIG_TCG', if_true: files(
-  'cc_helper.c',
-  'crypto_helper.c',
-  'excp_helper.c',
-  'fpu_helper.c',
-  'int_helper.c',
-  'mem_helper.c',
-  'misc_helper.c',
-  'translate.c',
-  'vec_fpu_helper.c',
-  'vec_helper.c',
-  'vec_int_helper.c',
-  'vec_string_helper.c',
-))
-
 s390x_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c'))
 
 gen_features = executable('gen-features', 'gen-features.c', native: true,
@@ -60,6 +45,8 @@ endif
 
 s390x_user_ss = ss.source_set()
 
+subdir('tcg')
+
 target_arch += {'s390x': s390x_ss}
 target_softmmu_arch += {'s390x': s390x_softmmu_ss}
 target_user_arch += {'s390x': s390x_user_ss}

diff --git a/target/s390x/cc_helper.c b/target/s390x/tcg/cc_helper.c
similarity index 100%
rename from target/s390x/cc_helper.c
rename to target/s390x/tcg/cc_helper.c

diff --git a/target/s390x/crypto_helper.c b/target/s390x/tcg/crypto_helper.c
similarity index 100%
rename from target/s390x/crypto_helper.c
rename to target/s390x/tcg/crypto_helper.c

diff --git a/target/s390x/excp_helper.c b/target/s390x/tcg/excp_helper.c
similarity index 100%
rename from target/s390x/excp_helper.c
rename to target/s390x/tcg/excp_helper.c

diff --git a/target/s390x/fpu_helper.c b/target/s390x/tcg/fpu_helper.c
similarity index 100%
rename from target/s390x/fpu_helper.c
rename to target/s390x/tcg/fpu_helper.c

diff --git a/target/s390x/insn-data.def b/target/s390x/tcg/insn-data.def
similarity index 100%
rename from target/s390x/insn-data.def
rename to target/s390x/tcg/insn-data.def

diff --git a/target/s390x/insn-format.def b/target/s390x/tcg/insn-format.def
similarity index 100%
rename from target/s390x/insn-format.def
rename to target/s390x/tcg/insn-format.def

diff --git a/target/s390x/int_helper.c b/target/s390x/tcg/int_helper.c
similarity index 100%
rename from target/s390x/int_helper.c
rename to target/s390x/tcg/int_helper.c

diff --git a/target/s390x/mem_helper.c b/target/s390x/tcg/mem_helper.c
similarity index 100%
rename from target/s390x/mem_helper.c
rename to target/s390x/tcg/mem_helper.c

diff --git a/target/s390x/tcg/meson.build b/target/s390x/tcg/meson.build
new file mode 100644 (file)
index 0000000..ee4e8fe
--- /dev/null
+++ b/target/s390x/tcg/meson.build
@@ -0,0 +1,14 @@
+s390x_ss.add(when: 'CONFIG_TCG', if_true: files(
+  'cc_helper.c',
+  'crypto_helper.c',
+  'excp_helper.c',
+  'fpu_helper.c',
+  'int_helper.c',
+  'mem_helper.c',
+  'misc_helper.c',
+  'translate.c',
+  'vec_fpu_helper.c',
+  'vec_helper.c',
+  'vec_int_helper.c',
+  'vec_string_helper.c',
+))

diff --git a/target/s390x/misc_helper.c b/target/s390x/tcg/misc_helper.c
similarity index 100%
rename from target/s390x/misc_helper.c
rename to target/s390x/tcg/misc_helper.c

diff --git a/target/s390x/s390-tod.h b/target/s390x/tcg/s390-tod.h
similarity index 100%
rename from target/s390x/s390-tod.h
rename to target/s390x/tcg/s390-tod.h

diff --git a/target/s390x/tcg_s390x.h b/target/s390x/tcg/tcg_s390x.h
similarity index 100%
rename from target/s390x/tcg_s390x.h
rename to target/s390x/tcg/tcg_s390x.h

diff --git a/target/s390x/translate.c b/target/s390x/tcg/translate.c
similarity index 100%
rename from target/s390x/translate.c
rename to target/s390x/tcg/translate.c

diff --git a/target/s390x/translate_vx.c.inc b/target/s390x/tcg/translate_vx.c.inc
similarity index 100%
rename from target/s390x/translate_vx.c.inc
rename to target/s390x/tcg/translate_vx.c.inc

diff --git a/target/s390x/vec.h b/target/s390x/tcg/vec.h
similarity index 100%
rename from target/s390x/vec.h
rename to target/s390x/tcg/vec.h

diff --git a/target/s390x/vec_fpu_helper.c b/target/s390x/tcg/vec_fpu_helper.c
similarity index 100%
rename from target/s390x/vec_fpu_helper.c
rename to target/s390x/tcg/vec_fpu_helper.c

diff --git a/target/s390x/vec_helper.c b/target/s390x/tcg/vec_helper.c
similarity index 100%
rename from target/s390x/vec_helper.c
rename to target/s390x/tcg/vec_helper.c

diff --git a/target/s390x/vec_int_helper.c b/target/s390x/tcg/vec_int_helper.c
similarity index 100%
rename from target/s390x/vec_int_helper.c
rename to target/s390x/tcg/vec_int_helper.c

diff --git a/target/s390x/vec_string_helper.c b/target/s390x/tcg/vec_string_helper.c
similarity index 100%
rename from target/s390x/vec_string_helper.c
rename to target/s390x/tcg/vec_string_helper.c