On Thu, 6 Aug 2020 at 21:09, Paolo Bonzini <pbonz...@redhat.com> wrote: > > From: Marc-André Lureau <marcandre.lur...@redhat.com> > > Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> diff --git a/scripts/decodetree.py b/scripts/decodetree.py > index 694757b..4cd1e10 100755 > --- a/scripts/decodetree.py > +++ b/scripts/decodetree.py > @@ -1257,7 +1257,7 @@ def main(): > long_opts = ['decode=', 'translate=', 'output=', 'insnwidth=', > 'static-decode=', 'varinsnwidth='] > try: > - (opts, args) = getopt.getopt(sys.argv[1:], 'o:vw:', long_opts) > + (opts, args) = getopt.gnu_getopt(sys.argv[1:], 'o:vw:', long_opts) > except getopt.GetoptError as err: > error(0, err) > for o, a in opts: This change to the decodetree script doesn't seem like it belongs in this patch ? > --- /dev/null > +++ b/target/arm/meson.build > @@ -0,0 +1,62 @@ > +gen = [ > + decodetree.process('sve.decode', extra_args: '--decode=disas_sve'), > + decodetree.process('neon-shared.decode', extra_args: > '--static-decode=disas_neon_shared'), > + decodetree.process('neon-dp.decode', extra_args: > '--static-decode=disas_neon_dp'), > + decodetree.process('neon-ls.decode', extra_args: > '--static-decode=disas_neon_ls'), > + decodetree.process('vfp.decode', extra_args: '--static-decode=disas_vfp'), > + decodetree.process('vfp-uncond.decode', extra_args: > '--static-decode=disas_vfp_uncond'), > + decodetree.process('a32.decode', extra_args: '--static-decode=disas_a32'), > + decodetree.process('a32-uncond.decode', extra_args: > '--static-decode=disas_a32_uncond'), > + decodetree.process('t32.decode', extra_args: '--static-decode=disas_t32'), > + decodetree.process('t16.decode', extra_args: ['-w', '16', > '--static-decode=disas_t16']), > +] > + > +arm_ss = ss.source_set() > +arm_ss.add(gen) > +arm_ss.add(files( > + 'cpu.c', > + 'crypto_helper.c', > + 'debug_helper.c', > + 'gdbstub.c', > + 'helper.c', > + 'iwmmxt_helper.c', > + 'm_helper.c', > + 'neon_helper.c', > + 'op_helper.c', > + 'tlb_helper.c', > + 'translate.c', > + 'vec_helper.c', > + 'vfp_helper.c', > + 'cpu_tcg.c', > +)) > +arm_ss.add(zlib) Just to check, does this get the underlying dependencies right? ie translate.o depends on translate.c and also eg translate-vfp.inc.c, which in turn depends on vfp.decode ? It's not clear to me why all the decodetree lines ended up in a single "gen = []" block -- they're independent of each other. thanks -- PMM