| Message ID | 20210422115430.15078-6-cfontana@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390x cleanup | expand |
On 22.04.21 13:54, Claudio Fontana 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. > > The internal.h file is renamed to s390x-internal.h, because of the > risk of collision with other files with the same name. > > Signed-off-by: Claudio Fontana <cfontana@suse.de> > --- > include/hw/s390x/tod.h | 2 +- > target/s390x/{internal.h => s390x-internal.h} | 0 > target/s390x/{ => tcg}/s390-tod.h | 0 > target/s390x/{ => tcg}/tcg_s390x.h | 0 > target/s390x/{ => tcg}/vec.h | 0 > hw/s390x/tod-tcg.c | 2 +- > target/s390x/arch_dump.c | 2 +- > target/s390x/cpu.c | 2 +- > target/s390x/cpu_models.c | 2 +- > target/s390x/diag.c | 2 +- > target/s390x/gdbstub.c | 2 +- > target/s390x/helper.c | 2 +- > target/s390x/interrupt.c | 4 ++-- > target/s390x/ioinst.c | 2 +- > target/s390x/kvm.c | 2 +- > target/s390x/machine.c | 4 ++-- > target/s390x/mmu_helper.c | 2 +- > target/s390x/sigp.c | 2 +- > target/s390x/{ => tcg}/cc_helper.c | 2 +- > target/s390x/{ => tcg}/crypto_helper.c | 2 +- > target/s390x/{ => tcg}/excp_helper.c | 2 +- > target/s390x/{ => tcg}/fpu_helper.c | 2 +- > target/s390x/{ => tcg}/int_helper.c | 2 +- > target/s390x/{ => tcg}/mem_helper.c | 2 +- > target/s390x/{ => tcg}/misc_helper.c | 2 +- > target/s390x/{ => tcg}/translate.c | 2 +- > target/s390x/{ => tcg}/vec_fpu_helper.c | 2 +- > target/s390x/{ => tcg}/vec_helper.c | 2 +- > target/s390x/{ => tcg}/vec_int_helper.c | 0 > target/s390x/{ => tcg}/vec_string_helper.c | 2 +- > target/s390x/{ => tcg}/translate_vx.c.inc | 0 > target/s390x/meson.build | 17 ++--------------- > target/s390x/{ => tcg}/insn-data.def | 0 > target/s390x/{ => tcg}/insn-format.def | 0 > target/s390x/tcg/meson.build | 14 ++++++++++++++ > 35 files changed, 43 insertions(+), 42 deletions(-) > rename target/s390x/{internal.h => s390x-internal.h} (100%) > rename target/s390x/{ => tcg}/s390-tod.h (100%) > rename target/s390x/{ => tcg}/tcg_s390x.h (100%) > rename target/s390x/{ => tcg}/vec.h (100%) > rename target/s390x/{ => tcg}/cc_helper.c (99%) > rename target/s390x/{ => tcg}/crypto_helper.c (98%) > rename target/s390x/{ => tcg}/excp_helper.c (99%) > rename target/s390x/{ => tcg}/fpu_helper.c (99%) > rename target/s390x/{ => tcg}/int_helper.c (99%) > rename target/s390x/{ => tcg}/mem_helper.c (99%) > rename target/s390x/{ => tcg}/misc_helper.c (99%) > rename target/s390x/{ => tcg}/translate.c (99%) > rename target/s390x/{ => tcg}/vec_fpu_helper.c (99%) > rename target/s390x/{ => tcg}/vec_helper.c (99%) > rename target/s390x/{ => tcg}/vec_int_helper.c (100%) > rename target/s390x/{ => tcg}/vec_string_helper.c (99%) > rename target/s390x/{ => tcg}/translate_vx.c.inc (100%) > rename target/s390x/{ => tcg}/insn-data.def (100%) > rename target/s390x/{ => tcg}/insn-format.def (100%) > create mode 100644 target/s390x/tcg/meson.build > > 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/internal.h b/target/s390x/s390x-internal.h > similarity index 100% > rename from target/s390x/internal.h > rename to target/s390x/s390x-internal.h > 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/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/hw/s390x/tod-tcg.c b/hw/s390x/tod-tcg.c > index e91b9590f5..4b3e65050a 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/target/s390x/arch_dump.c b/target/s390x/arch_dump.c > index cc1330876b..08daf93ae1 100644 > --- a/target/s390x/arch_dump.c > +++ b/target/s390x/arch_dump.c > @@ -13,7 +13,7 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "elf.h" > #include "sysemu/dump.h" > > diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c > index d35eb39a1b..ae054d264b 100644 > --- a/target/s390x/cpu.c > +++ b/target/s390x/cpu.c > @@ -23,7 +23,7 @@ > #include "qemu/osdep.h" > #include "qapi/error.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "kvm_s390x.h" > #include "sysemu/kvm.h" > #include "sysemu/reset.h" > diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c > index 050dcf2d42..4ff8cba7e5 100644 > --- a/target/s390x/cpu_models.c > +++ b/target/s390x/cpu_models.c > @@ -12,7 +12,7 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "kvm_s390x.h" > #include "sysemu/kvm.h" > #include "sysemu/tcg.h" > diff --git a/target/s390x/diag.c b/target/s390x/diag.c > index 1a48429564..86b7032b5b 100644 > --- a/target/s390x/diag.c > +++ b/target/s390x/diag.c > @@ -14,7 +14,7 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "exec/address-spaces.h" > #include "hw/watchdog/wdt_diag288.h" > #include "sysemu/cpus.h" > diff --git a/target/s390x/gdbstub.c b/target/s390x/gdbstub.c > index d6fce5ff1e..1dbe2973f4 100644 > --- a/target/s390x/gdbstub.c > +++ b/target/s390x/gdbstub.c > @@ -20,7 +20,7 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "exec/exec-all.h" > #include "exec/gdbstub.h" > #include "qemu/bitops.h" > diff --git a/target/s390x/helper.c b/target/s390x/helper.c > index 7678994feb..2254873cef 100644 > --- a/target/s390x/helper.c > +++ b/target/s390x/helper.c > @@ -20,7 +20,7 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "exec/gdbstub.h" > #include "qemu/timer.h" > #include "qemu/qemu-print.h" > diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c > index 4cdbbc8849..d0e58d6e8d 100644 > --- a/target/s390x/interrupt.c > +++ b/target/s390x/interrupt.c > @@ -11,12 +11,12 @@ > #include "qemu/log.h" > #include "cpu.h" > #include "kvm_s390x.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "exec/exec-all.h" > #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/ioinst.c b/target/s390x/ioinst.c > index 1ee11522e1..4eb0a7a9f8 100644 > --- a/target/s390x/ioinst.c > +++ b/target/s390x/ioinst.c > @@ -12,7 +12,7 @@ > #include "qemu/osdep.h" > > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "hw/s390x/ioinst.h" > #include "trace.h" > #include "hw/s390x/s390-pci-bus.h" > diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c > index 4fb3bbfef5..2a22cc69f6 100644 > --- a/target/s390x/kvm.c > +++ b/target/s390x/kvm.c > @@ -26,7 +26,7 @@ > > #include "qemu-common.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "kvm_s390x.h" > #include "sysemu/kvm_int.h" > #include "qemu/cutils.h" > diff --git a/target/s390x/machine.c b/target/s390x/machine.c > index 5b4e82f1ab..81a8a7ff99 100644 > --- a/target/s390x/machine.c > +++ b/target/s390x/machine.c > @@ -16,10 +16,10 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#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/mmu_helper.c b/target/s390x/mmu_helper.c > index d492b23a17..52fdd86c63 100644 > --- a/target/s390x/mmu_helper.c > +++ b/target/s390x/mmu_helper.c > @@ -19,7 +19,7 @@ > #include "qemu/error-report.h" > #include "exec/address-spaces.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "kvm_s390x.h" > #include "sysemu/kvm.h" > #include "sysemu/tcg.h" > diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c > index c604f17710..320dddbae2 100644 > --- a/target/s390x/sigp.c > +++ b/target/s390x/sigp.c > @@ -10,7 +10,7 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "sysemu/hw_accel.h" > #include "sysemu/runstate.h" > #include "exec/address-spaces.h" > diff --git a/target/s390x/cc_helper.c b/target/s390x/tcg/cc_helper.c > similarity index 99% > rename from target/s390x/cc_helper.c > rename to target/s390x/tcg/cc_helper.c > index e7039d0d18..f0663f7a3e 100644 > --- a/target/s390x/cc_helper.c > +++ b/target/s390x/tcg/cc_helper.c > @@ -20,7 +20,7 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "tcg_s390x.h" > #include "exec/exec-all.h" > #include "exec/helper-proto.h" > diff --git a/target/s390x/crypto_helper.c b/target/s390x/tcg/crypto_helper.c > similarity index 98% > rename from target/s390x/crypto_helper.c > rename to target/s390x/tcg/crypto_helper.c > index ff3fbc3950..138d9e7ad9 100644 > --- a/target/s390x/crypto_helper.c > +++ b/target/s390x/tcg/crypto_helper.c > @@ -12,7 +12,7 @@ > > #include "qemu/osdep.h" > #include "qemu/main-loop.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "tcg_s390x.h" > #include "exec/helper-proto.h" > #include "exec/exec-all.h" > diff --git a/target/s390x/excp_helper.c b/target/s390x/tcg/excp_helper.c > similarity index 99% > rename from target/s390x/excp_helper.c > rename to target/s390x/tcg/excp_helper.c > index c48cd6b46f..ecc830cea0 100644 > --- a/target/s390x/excp_helper.c > +++ b/target/s390x/tcg/excp_helper.c > @@ -20,7 +20,7 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "exec/helper-proto.h" > #include "qemu/timer.h" > #include "exec/exec-all.h" > diff --git a/target/s390x/fpu_helper.c b/target/s390x/tcg/fpu_helper.c > similarity index 99% > rename from target/s390x/fpu_helper.c > rename to target/s390x/tcg/fpu_helper.c > index f155bc048c..bc89ef7cc8 100644 > --- a/target/s390x/fpu_helper.c > +++ b/target/s390x/tcg/fpu_helper.c > @@ -20,7 +20,7 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "tcg_s390x.h" > #include "exec/exec-all.h" > #include "exec/cpu_ldst.h" > diff --git a/target/s390x/int_helper.c b/target/s390x/tcg/int_helper.c > similarity index 99% > rename from target/s390x/int_helper.c > rename to target/s390x/tcg/int_helper.c > index 658507dd6d..954542388a 100644 > --- a/target/s390x/int_helper.c > +++ b/target/s390x/tcg/int_helper.c > @@ -20,7 +20,7 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "tcg_s390x.h" > #include "exec/exec-all.h" > #include "qemu/host-utils.h" > diff --git a/target/s390x/mem_helper.c b/target/s390x/tcg/mem_helper.c > similarity index 99% > rename from target/s390x/mem_helper.c > rename to target/s390x/tcg/mem_helper.c > index 12e84a4285..a91791a1b7 100644 > --- a/target/s390x/mem_helper.c > +++ b/target/s390x/tcg/mem_helper.c > @@ -20,7 +20,7 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "tcg_s390x.h" > #include "exec/helper-proto.h" > #include "exec/exec-all.h" > diff --git a/target/s390x/misc_helper.c b/target/s390x/tcg/misc_helper.c > similarity index 99% > rename from target/s390x/misc_helper.c > rename to target/s390x/tcg/misc_helper.c > index 7ea90d414a..33e6999e15 100644 > --- a/target/s390x/misc_helper.c > +++ b/target/s390x/tcg/misc_helper.c > @@ -22,7 +22,7 @@ > #include "qemu/cutils.h" > #include "qemu/main-loop.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "exec/memory.h" > #include "qemu/host-utils.h" > #include "exec/helper-proto.h" > diff --git a/target/s390x/translate.c b/target/s390x/tcg/translate.c > similarity index 99% > rename from target/s390x/translate.c > rename to target/s390x/tcg/translate.c > index 4f953ddfba..ac236888a0 100644 > --- a/target/s390x/translate.c > +++ b/target/s390x/tcg/translate.c > @@ -30,7 +30,7 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "disas/disas.h" > #include "exec/exec-all.h" > #include "tcg/tcg-op.h" > diff --git a/target/s390x/vec_fpu_helper.c b/target/s390x/tcg/vec_fpu_helper.c > similarity index 99% > rename from target/s390x/vec_fpu_helper.c > rename to target/s390x/tcg/vec_fpu_helper.c > index c1564e819b..850fac721e 100644 > --- a/target/s390x/vec_fpu_helper.c > +++ b/target/s390x/tcg/vec_fpu_helper.c > @@ -12,7 +12,7 @@ > #include "qemu/osdep.h" > #include "qemu-common.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "vec.h" > #include "tcg_s390x.h" > #include "tcg/tcg-gvec-desc.h" > diff --git a/target/s390x/vec_helper.c b/target/s390x/tcg/vec_helper.c > similarity index 99% > rename from target/s390x/vec_helper.c > rename to target/s390x/tcg/vec_helper.c > index 986e7cc825..ddd0a8be5b 100644 > --- a/target/s390x/vec_helper.c > +++ b/target/s390x/tcg/vec_helper.c > @@ -11,7 +11,7 @@ > */ > #include "qemu/osdep.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "vec.h" > #include "tcg/tcg.h" > #include "tcg/tcg-gvec-desc.h" > 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 99% > rename from target/s390x/vec_string_helper.c > rename to target/s390x/tcg/vec_string_helper.c > index c516c0ceeb..ac315eb095 100644 > --- a/target/s390x/vec_string_helper.c > +++ b/target/s390x/tcg/vec_string_helper.c > @@ -12,7 +12,7 @@ > #include "qemu/osdep.h" > #include "qemu-common.h" > #include "cpu.h" > -#include "internal.h" > +#include "s390x-internal.h" > #include "vec.h" > #include "tcg/tcg.h" > #include "tcg/tcg-gvec-desc.h" > 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/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/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/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', > +)) > Acked-by: David Hildenbrand <david@redhat.com>
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/internal.h b/target/s390x/s390x-internal.h similarity index 100% rename from target/s390x/internal.h rename to target/s390x/s390x-internal.h 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/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/hw/s390x/tod-tcg.c b/hw/s390x/tod-tcg.c index e91b9590f5..4b3e65050a 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/target/s390x/arch_dump.c b/target/s390x/arch_dump.c index cc1330876b..08daf93ae1 100644 --- a/target/s390x/arch_dump.c +++ b/target/s390x/arch_dump.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "elf.h" #include "sysemu/dump.h" diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index d35eb39a1b..ae054d264b 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "kvm_s390x.h" #include "sysemu/kvm.h" #include "sysemu/reset.h" diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 050dcf2d42..4ff8cba7e5 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "kvm_s390x.h" #include "sysemu/kvm.h" #include "sysemu/tcg.h" diff --git a/target/s390x/diag.c b/target/s390x/diag.c index 1a48429564..86b7032b5b 100644 --- a/target/s390x/diag.c +++ b/target/s390x/diag.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "exec/address-spaces.h" #include "hw/watchdog/wdt_diag288.h" #include "sysemu/cpus.h" diff --git a/target/s390x/gdbstub.c b/target/s390x/gdbstub.c index d6fce5ff1e..1dbe2973f4 100644 --- a/target/s390x/gdbstub.c +++ b/target/s390x/gdbstub.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "exec/exec-all.h" #include "exec/gdbstub.h" #include "qemu/bitops.h" diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 7678994feb..2254873cef 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "exec/gdbstub.h" #include "qemu/timer.h" #include "qemu/qemu-print.h" diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c index 4cdbbc8849..d0e58d6e8d 100644 --- a/target/s390x/interrupt.c +++ b/target/s390x/interrupt.c @@ -11,12 +11,12 @@ #include "qemu/log.h" #include "cpu.h" #include "kvm_s390x.h" -#include "internal.h" +#include "s390x-internal.h" #include "exec/exec-all.h" #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/ioinst.c b/target/s390x/ioinst.c index 1ee11522e1..4eb0a7a9f8 100644 --- a/target/s390x/ioinst.c +++ b/target/s390x/ioinst.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "hw/s390x/ioinst.h" #include "trace.h" #include "hw/s390x/s390-pci-bus.h" diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 4fb3bbfef5..2a22cc69f6 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -26,7 +26,7 @@ #include "qemu-common.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "kvm_s390x.h" #include "sysemu/kvm_int.h" #include "qemu/cutils.h" diff --git a/target/s390x/machine.c b/target/s390x/machine.c index 5b4e82f1ab..81a8a7ff99 100644 --- a/target/s390x/machine.c +++ b/target/s390x/machine.c @@ -16,10 +16,10 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#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/mmu_helper.c b/target/s390x/mmu_helper.c index d492b23a17..52fdd86c63 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -19,7 +19,7 @@ #include "qemu/error-report.h" #include "exec/address-spaces.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "kvm_s390x.h" #include "sysemu/kvm.h" #include "sysemu/tcg.h" diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c index c604f17710..320dddbae2 100644 --- a/target/s390x/sigp.c +++ b/target/s390x/sigp.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "sysemu/hw_accel.h" #include "sysemu/runstate.h" #include "exec/address-spaces.h" diff --git a/target/s390x/cc_helper.c b/target/s390x/tcg/cc_helper.c similarity index 99% rename from target/s390x/cc_helper.c rename to target/s390x/tcg/cc_helper.c index e7039d0d18..f0663f7a3e 100644 --- a/target/s390x/cc_helper.c +++ b/target/s390x/tcg/cc_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "tcg_s390x.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" diff --git a/target/s390x/crypto_helper.c b/target/s390x/tcg/crypto_helper.c similarity index 98% rename from target/s390x/crypto_helper.c rename to target/s390x/tcg/crypto_helper.c index ff3fbc3950..138d9e7ad9 100644 --- a/target/s390x/crypto_helper.c +++ b/target/s390x/tcg/crypto_helper.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" -#include "internal.h" +#include "s390x-internal.h" #include "tcg_s390x.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" diff --git a/target/s390x/excp_helper.c b/target/s390x/tcg/excp_helper.c similarity index 99% rename from target/s390x/excp_helper.c rename to target/s390x/tcg/excp_helper.c index c48cd6b46f..ecc830cea0 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/tcg/excp_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "exec/helper-proto.h" #include "qemu/timer.h" #include "exec/exec-all.h" diff --git a/target/s390x/fpu_helper.c b/target/s390x/tcg/fpu_helper.c similarity index 99% rename from target/s390x/fpu_helper.c rename to target/s390x/tcg/fpu_helper.c index f155bc048c..bc89ef7cc8 100644 --- a/target/s390x/fpu_helper.c +++ b/target/s390x/tcg/fpu_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "tcg_s390x.h" #include "exec/exec-all.h" #include "exec/cpu_ldst.h" diff --git a/target/s390x/int_helper.c b/target/s390x/tcg/int_helper.c similarity index 99% rename from target/s390x/int_helper.c rename to target/s390x/tcg/int_helper.c index 658507dd6d..954542388a 100644 --- a/target/s390x/int_helper.c +++ b/target/s390x/tcg/int_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "tcg_s390x.h" #include "exec/exec-all.h" #include "qemu/host-utils.h" diff --git a/target/s390x/mem_helper.c b/target/s390x/tcg/mem_helper.c similarity index 99% rename from target/s390x/mem_helper.c rename to target/s390x/tcg/mem_helper.c index 12e84a4285..a91791a1b7 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "tcg_s390x.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" diff --git a/target/s390x/misc_helper.c b/target/s390x/tcg/misc_helper.c similarity index 99% rename from target/s390x/misc_helper.c rename to target/s390x/tcg/misc_helper.c index 7ea90d414a..33e6999e15 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/tcg/misc_helper.c @@ -22,7 +22,7 @@ #include "qemu/cutils.h" #include "qemu/main-loop.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "exec/memory.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" diff --git a/target/s390x/translate.c b/target/s390x/tcg/translate.c similarity index 99% rename from target/s390x/translate.c rename to target/s390x/tcg/translate.c index 4f953ddfba..ac236888a0 100644 --- a/target/s390x/translate.c +++ b/target/s390x/tcg/translate.c @@ -30,7 +30,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "disas/disas.h" #include "exec/exec-all.h" #include "tcg/tcg-op.h" diff --git a/target/s390x/vec_fpu_helper.c b/target/s390x/tcg/vec_fpu_helper.c similarity index 99% rename from target/s390x/vec_fpu_helper.c rename to target/s390x/tcg/vec_fpu_helper.c index c1564e819b..850fac721e 100644 --- a/target/s390x/vec_fpu_helper.c +++ b/target/s390x/tcg/vec_fpu_helper.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "vec.h" #include "tcg_s390x.h" #include "tcg/tcg-gvec-desc.h" diff --git a/target/s390x/vec_helper.c b/target/s390x/tcg/vec_helper.c similarity index 99% rename from target/s390x/vec_helper.c rename to target/s390x/tcg/vec_helper.c index 986e7cc825..ddd0a8be5b 100644 --- a/target/s390x/vec_helper.c +++ b/target/s390x/tcg/vec_helper.c @@ -11,7 +11,7 @@ */ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "vec.h" #include "tcg/tcg.h" #include "tcg/tcg-gvec-desc.h" 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 99% rename from target/s390x/vec_string_helper.c rename to target/s390x/tcg/vec_string_helper.c index c516c0ceeb..ac315eb095 100644 --- a/target/s390x/vec_string_helper.c +++ b/target/s390x/tcg/vec_string_helper.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "cpu.h" -#include "internal.h" +#include "s390x-internal.h" #include "vec.h" #include "tcg/tcg.h" #include "tcg/tcg-gvec-desc.h" 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/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/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/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', +))
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. The internal.h file is renamed to s390x-internal.h, because of the risk of collision with other files with the same name. Signed-off-by: Claudio Fontana <cfontana@suse.de> --- include/hw/s390x/tod.h | 2 +- target/s390x/{internal.h => s390x-internal.h} | 0 target/s390x/{ => tcg}/s390-tod.h | 0 target/s390x/{ => tcg}/tcg_s390x.h | 0 target/s390x/{ => tcg}/vec.h | 0 hw/s390x/tod-tcg.c | 2 +- target/s390x/arch_dump.c | 2 +- target/s390x/cpu.c | 2 +- target/s390x/cpu_models.c | 2 +- target/s390x/diag.c | 2 +- target/s390x/gdbstub.c | 2 +- target/s390x/helper.c | 2 +- target/s390x/interrupt.c | 4 ++-- target/s390x/ioinst.c | 2 +- target/s390x/kvm.c | 2 +- target/s390x/machine.c | 4 ++-- target/s390x/mmu_helper.c | 2 +- target/s390x/sigp.c | 2 +- target/s390x/{ => tcg}/cc_helper.c | 2 +- target/s390x/{ => tcg}/crypto_helper.c | 2 +- target/s390x/{ => tcg}/excp_helper.c | 2 +- target/s390x/{ => tcg}/fpu_helper.c | 2 +- target/s390x/{ => tcg}/int_helper.c | 2 +- target/s390x/{ => tcg}/mem_helper.c | 2 +- target/s390x/{ => tcg}/misc_helper.c | 2 +- target/s390x/{ => tcg}/translate.c | 2 +- target/s390x/{ => tcg}/vec_fpu_helper.c | 2 +- target/s390x/{ => tcg}/vec_helper.c | 2 +- target/s390x/{ => tcg}/vec_int_helper.c | 0 target/s390x/{ => tcg}/vec_string_helper.c | 2 +- target/s390x/{ => tcg}/translate_vx.c.inc | 0 target/s390x/meson.build | 17 ++--------------- target/s390x/{ => tcg}/insn-data.def | 0 target/s390x/{ => tcg}/insn-format.def | 0 target/s390x/tcg/meson.build | 14 ++++++++++++++ 35 files changed, 43 insertions(+), 42 deletions(-) rename target/s390x/{internal.h => s390x-internal.h} (100%) rename target/s390x/{ => tcg}/s390-tod.h (100%) rename target/s390x/{ => tcg}/tcg_s390x.h (100%) rename target/s390x/{ => tcg}/vec.h (100%) rename target/s390x/{ => tcg}/cc_helper.c (99%) rename target/s390x/{ => tcg}/crypto_helper.c (98%) rename target/s390x/{ => tcg}/excp_helper.c (99%) rename target/s390x/{ => tcg}/fpu_helper.c (99%) rename target/s390x/{ => tcg}/int_helper.c (99%) rename target/s390x/{ => tcg}/mem_helper.c (99%) rename target/s390x/{ => tcg}/misc_helper.c (99%) rename target/s390x/{ => tcg}/translate.c (99%) rename target/s390x/{ => tcg}/vec_fpu_helper.c (99%) rename target/s390x/{ => tcg}/vec_helper.c (99%) rename target/s390x/{ => tcg}/vec_int_helper.c (100%) rename target/s390x/{ => tcg}/vec_string_helper.c (99%) rename target/s390x/{ => tcg}/translate_vx.c.inc (100%) rename target/s390x/{ => tcg}/insn-data.def (100%) rename target/s390x/{ => tcg}/insn-format.def (100%) create mode 100644 target/s390x/tcg/meson.build