| Message ID | 20210707105324.23400-8-acho@suse.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x cleanup | expand |
On 07/07/2021 12.53, Cho, Yu-Chen wrote: > 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> > --- > MAINTAINERS | 1 + > hw/s390x/tod-tcg.c | 2 +- > include/hw/s390x/tod.h | 2 +- > target/s390x/interrupt.c | 2 +- > target/s390x/machine.c | 2 +- > target/s390x/meson.build | 17 ++--------------- > target/s390x/{ => tcg}/cc_helper.c | 0 > target/s390x/{ => tcg}/crypto_helper.c | 0 > target/s390x/{ => tcg}/excp_helper.c | 0 > target/s390x/{ => tcg}/fpu_helper.c | 0 > target/s390x/{ => tcg}/insn-data.def | 0 > target/s390x/{ => tcg}/insn-format.def | 0 > target/s390x/{ => tcg}/int_helper.c | 0 > target/s390x/{ => tcg}/mem_helper.c | 0 > target/s390x/tcg/meson.build | 14 ++++++++++++++ > target/s390x/{ => tcg}/misc_helper.c | 0 > target/s390x/{ => tcg}/s390-tod.h | 0 > target/s390x/{ => tcg}/tcg_s390x.h | 0 > target/s390x/{ => tcg}/translate.c | 0 > target/s390x/{ => tcg}/translate_vx.c.inc | 0 > target/s390x/{ => tcg}/vec.h | 0 > target/s390x/{ => tcg}/vec_fpu_helper.c | 0 > target/s390x/{ => tcg}/vec_helper.c | 0 > target/s390x/{ => tcg}/vec_int_helper.c | 0 > target/s390x/{ => tcg}/vec_string_helper.c | 0 > 25 files changed, 21 insertions(+), 19 deletions(-) > rename target/s390x/{ => tcg}/cc_helper.c (100%) > rename target/s390x/{ => tcg}/crypto_helper.c (100%) > rename target/s390x/{ => tcg}/excp_helper.c (100%) > rename target/s390x/{ => tcg}/fpu_helper.c (100%) > rename target/s390x/{ => tcg}/insn-data.def (100%) > rename target/s390x/{ => tcg}/insn-format.def (100%) > rename target/s390x/{ => tcg}/int_helper.c (100%) > rename target/s390x/{ => tcg}/mem_helper.c (100%) > create mode 100644 target/s390x/tcg/meson.build > rename target/s390x/{ => tcg}/misc_helper.c (100%) > rename target/s390x/{ => tcg}/s390-tod.h (100%) [...] > diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h > index ff3195a4bf..0935e85089 100644 > --- 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" Technically, s390-tod.h is not specific to tcg, so I'm not sure whether we really want to move it ... maybe it would even be possible to merge its contents into include/hw/s390x/tod.h instead .... but we can still clean that up later, so FWIW: Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/MAINTAINERS b/MAINTAINERS index 684142e12e..8ec845f4e0 100644 --- 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 aa44deb809..9bb94ff72b 100644 --- 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 ff3195a4bf..0935e85089 100644 --- 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 3fde18ba46..734f0c62de 100644 --- 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 4f11f6ac6e..81a8a7ff99 100644 --- 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 a5e1ded93f..60d7f1b908 100644 --- 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 index 0000000000..ee4e8fec77 --- /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