| Message ID | 20201208194839.31305-9-cfontana@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | i386 cleanup | expand |
Claudio Fontana <cfontana@suse.de> writes: > Signed-off-by: Claudio Fontana <cfontana@suse.de> > --- > target/i386/meson.build | 14 +------------- > target/i386/{ => tcg}/bpt_helper.c | 0 > target/i386/{ => tcg}/cc_helper.c | 0 > target/i386/{ => tcg}/excp_helper.c | 0 > target/i386/{ => tcg}/fpu_helper.c | 0 > target/i386/{ => tcg}/int_helper.c | 0 > target/i386/{ => tcg}/mem_helper.c | 0 > target/i386/tcg/meson.build | 13 +++++++++++++ > target/i386/{ => tcg}/misc_helper.c | 0 > target/i386/{ => tcg}/mpx_helper.c | 0 > target/i386/{ => tcg}/seg_helper.c | 0 > target/i386/{ => tcg}/smm_helper.c | 0 > target/i386/{ => tcg}/svm_helper.c | 0 > target/i386/{ => tcg}/tcg-stub.c | 0 > target/i386/{ => tcg}/translate.c | 0 > 15 files changed, 14 insertions(+), 13 deletions(-) > rename target/i386/{ => tcg}/bpt_helper.c (100%) > rename target/i386/{ => tcg}/cc_helper.c (100%) > rename target/i386/{ => tcg}/excp_helper.c (100%) > rename target/i386/{ => tcg}/fpu_helper.c (100%) > rename target/i386/{ => tcg}/int_helper.c (100%) > rename target/i386/{ => tcg}/mem_helper.c (100%) > create mode 100644 target/i386/tcg/meson.build > rename target/i386/{ => tcg}/misc_helper.c (100%) > rename target/i386/{ => tcg}/mpx_helper.c (100%) > rename target/i386/{ => tcg}/seg_helper.c (100%) > rename target/i386/{ => tcg}/smm_helper.c (100%) > rename target/i386/{ => tcg}/svm_helper.c (100%) > rename target/i386/{ => tcg}/tcg-stub.c (100%) > rename target/i386/{ => tcg}/translate.c (100%) I noticed target/i386/helper-tcg.h is still in the main directory. It maybe be a straggler that is harder to separate - if so might be worth mentioning in the commit message. Otherwise: Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
On 12/9/20 10:30 AM, Alex Bennée wrote: > > Claudio Fontana <cfontana@suse.de> writes: > >> Signed-off-by: Claudio Fontana <cfontana@suse.de> >> --- >> target/i386/meson.build | 14 +------------- >> target/i386/{ => tcg}/bpt_helper.c | 0 >> target/i386/{ => tcg}/cc_helper.c | 0 >> target/i386/{ => tcg}/excp_helper.c | 0 >> target/i386/{ => tcg}/fpu_helper.c | 0 >> target/i386/{ => tcg}/int_helper.c | 0 >> target/i386/{ => tcg}/mem_helper.c | 0 >> target/i386/tcg/meson.build | 13 +++++++++++++ >> target/i386/{ => tcg}/misc_helper.c | 0 >> target/i386/{ => tcg}/mpx_helper.c | 0 >> target/i386/{ => tcg}/seg_helper.c | 0 >> target/i386/{ => tcg}/smm_helper.c | 0 >> target/i386/{ => tcg}/svm_helper.c | 0 >> target/i386/{ => tcg}/tcg-stub.c | 0 >> target/i386/{ => tcg}/translate.c | 0 >> 15 files changed, 14 insertions(+), 13 deletions(-) >> rename target/i386/{ => tcg}/bpt_helper.c (100%) >> rename target/i386/{ => tcg}/cc_helper.c (100%) >> rename target/i386/{ => tcg}/excp_helper.c (100%) >> rename target/i386/{ => tcg}/fpu_helper.c (100%) >> rename target/i386/{ => tcg}/int_helper.c (100%) >> rename target/i386/{ => tcg}/mem_helper.c (100%) >> create mode 100644 target/i386/tcg/meson.build >> rename target/i386/{ => tcg}/misc_helper.c (100%) >> rename target/i386/{ => tcg}/mpx_helper.c (100%) >> rename target/i386/{ => tcg}/seg_helper.c (100%) >> rename target/i386/{ => tcg}/smm_helper.c (100%) >> rename target/i386/{ => tcg}/svm_helper.c (100%) >> rename target/i386/{ => tcg}/tcg-stub.c (100%) >> rename target/i386/{ => tcg}/translate.c (100%) > > I noticed target/i386/helper-tcg.h is still in the main directory. It This is something to fix in i386: move TCG cpu class initialization out of helper.c will do, thanks! > maybe be a straggler that is harder to separate - if so might be worth > mentioning in the commit message. Otherwise: > > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> >
diff --git a/target/i386/meson.build b/target/i386/meson.build index 284d52ab81..750471c9f3 100644 --- a/target/i386/meson.build +++ b/target/i386/meson.build @@ -5,19 +5,6 @@ i386_ss.add(files( 'helper.c', 'xsave_helper.c', )) -i386_ss.add(when: 'CONFIG_TCG', if_true: files( - 'bpt_helper.c', - 'cc_helper.c', - 'excp_helper.c', - 'fpu_helper.c', - 'int_helper.c', - 'mem_helper.c', - 'misc_helper.c', - 'mpx_helper.c', - 'seg_helper.c', - 'smm_helper.c', - 'svm_helper.c', - 'translate.c'), if_false: files('tcg-stub.c')) i386_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false: files('sev-stub.c')) i386_softmmu_ss = ss.source_set() @@ -32,6 +19,7 @@ subdir('kvm') subdir('hax') subdir('whpx') subdir('hvf') +subdir('tcg') target_arch += {'i386': i386_ss} target_softmmu_arch += {'i386': i386_softmmu_ss} diff --git a/target/i386/bpt_helper.c b/target/i386/tcg/bpt_helper.c similarity index 100% rename from target/i386/bpt_helper.c rename to target/i386/tcg/bpt_helper.c diff --git a/target/i386/cc_helper.c b/target/i386/tcg/cc_helper.c similarity index 100% rename from target/i386/cc_helper.c rename to target/i386/tcg/cc_helper.c diff --git a/target/i386/excp_helper.c b/target/i386/tcg/excp_helper.c similarity index 100% rename from target/i386/excp_helper.c rename to target/i386/tcg/excp_helper.c diff --git a/target/i386/fpu_helper.c b/target/i386/tcg/fpu_helper.c similarity index 100% rename from target/i386/fpu_helper.c rename to target/i386/tcg/fpu_helper.c diff --git a/target/i386/int_helper.c b/target/i386/tcg/int_helper.c similarity index 100% rename from target/i386/int_helper.c rename to target/i386/tcg/int_helper.c diff --git a/target/i386/mem_helper.c b/target/i386/tcg/mem_helper.c similarity index 100% rename from target/i386/mem_helper.c rename to target/i386/tcg/mem_helper.c diff --git a/target/i386/tcg/meson.build b/target/i386/tcg/meson.build new file mode 100644 index 0000000000..02794226c2 --- /dev/null +++ b/target/i386/tcg/meson.build @@ -0,0 +1,13 @@ +i386_ss.add(when: 'CONFIG_TCG', if_true: files( + 'bpt_helper.c', + 'cc_helper.c', + 'excp_helper.c', + 'fpu_helper.c', + 'int_helper.c', + 'mem_helper.c', + 'misc_helper.c', + 'mpx_helper.c', + 'seg_helper.c', + 'smm_helper.c', + 'svm_helper.c', + 'translate.c'), if_false: files('tcg-stub.c')) diff --git a/target/i386/misc_helper.c b/target/i386/tcg/misc_helper.c similarity index 100% rename from target/i386/misc_helper.c rename to target/i386/tcg/misc_helper.c diff --git a/target/i386/mpx_helper.c b/target/i386/tcg/mpx_helper.c similarity index 100% rename from target/i386/mpx_helper.c rename to target/i386/tcg/mpx_helper.c diff --git a/target/i386/seg_helper.c b/target/i386/tcg/seg_helper.c similarity index 100% rename from target/i386/seg_helper.c rename to target/i386/tcg/seg_helper.c diff --git a/target/i386/smm_helper.c b/target/i386/tcg/smm_helper.c similarity index 100% rename from target/i386/smm_helper.c rename to target/i386/tcg/smm_helper.c diff --git a/target/i386/svm_helper.c b/target/i386/tcg/svm_helper.c similarity index 100% rename from target/i386/svm_helper.c rename to target/i386/tcg/svm_helper.c diff --git a/target/i386/tcg-stub.c b/target/i386/tcg/tcg-stub.c similarity index 100% rename from target/i386/tcg-stub.c rename to target/i386/tcg/tcg-stub.c diff --git a/target/i386/translate.c b/target/i386/tcg/translate.c similarity index 100% rename from target/i386/translate.c rename to target/i386/tcg/translate.c
Signed-off-by: Claudio Fontana <cfontana@suse.de> --- target/i386/meson.build | 14 +------------- target/i386/{ => tcg}/bpt_helper.c | 0 target/i386/{ => tcg}/cc_helper.c | 0 target/i386/{ => tcg}/excp_helper.c | 0 target/i386/{ => tcg}/fpu_helper.c | 0 target/i386/{ => tcg}/int_helper.c | 0 target/i386/{ => tcg}/mem_helper.c | 0 target/i386/tcg/meson.build | 13 +++++++++++++ target/i386/{ => tcg}/misc_helper.c | 0 target/i386/{ => tcg}/mpx_helper.c | 0 target/i386/{ => tcg}/seg_helper.c | 0 target/i386/{ => tcg}/smm_helper.c | 0 target/i386/{ => tcg}/svm_helper.c | 0 target/i386/{ => tcg}/tcg-stub.c | 0 target/i386/{ => tcg}/translate.c | 0 15 files changed, 14 insertions(+), 13 deletions(-) rename target/i386/{ => tcg}/bpt_helper.c (100%) rename target/i386/{ => tcg}/cc_helper.c (100%) rename target/i386/{ => tcg}/excp_helper.c (100%) rename target/i386/{ => tcg}/fpu_helper.c (100%) rename target/i386/{ => tcg}/int_helper.c (100%) rename target/i386/{ => tcg}/mem_helper.c (100%) create mode 100644 target/i386/tcg/meson.build rename target/i386/{ => tcg}/misc_helper.c (100%) rename target/i386/{ => tcg}/mpx_helper.c (100%) rename target/i386/{ => tcg}/seg_helper.c (100%) rename target/i386/{ => tcg}/smm_helper.c (100%) rename target/i386/{ => tcg}/svm_helper.c (100%) rename target/i386/{ => tcg}/tcg-stub.c (100%) rename target/i386/{ => tcg}/translate.c (100%)