From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCFC-0005Iz-UK for qemu-devel@nongnu.org; Fri, 29 May 2015 00:50:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyCF9-000885-P8 for qemu-devel@nongnu.org; Fri, 29 May 2015 00:50:06 -0400 Received: from mail-pa0-x236.google.com ([2607:f8b0:400e:c03::236]:35543) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCF9-000860-Il for qemu-devel@nongnu.org; Fri, 29 May 2015 00:50:03 -0400 Received: by pacwv17 with SMTP id wv17so41908892pac.2 for ; Thu, 28 May 2015 21:50:01 -0700 (PDT) Date: Fri, 29 May 2015 14:45:32 +1000 From: "Edgar E. Iglesias" Message-ID: <20150529044532.GG17116@toto> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH v3 5/7] disas: microblaze: QOMify target specific disas setup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Crosthwaite Cc: peter.maydell@linaro.org, Peter Crosthwaite , claudio.fontana@huawei.com, qemu-devel@nongnu.org, rth@twiddle.net, afaerber@suse.de, egdar.iglesias@gmail.com Looks good: Reviewed-by: Edgar E. Iglesias On Sun, May 24, 2015 at 03:47:18PM -0700, Peter Crosthwaite wrote: > Move the target_disas() MB specifics to the QOM disas_set_info hook > and delete the MB specific code in disas.c. > > This also now adds support for monitor disas to Microblaze. > > E.g. > (qemu) xp 0x90000000 > 0000000090000000: 0x94208001 > > And before this patch: > (qemu) xp/i 0x90000000 > 0x90000000: Asm output not supported on this arch > > After: > (qemu) xp/i 0x90000000 > 0x90000000: mfs r1, rmsr > > Signed-off-by: Peter Crosthwaite > --- > disas.c | 3 --- > target-microblaze/cpu.c | 8 ++++++++ > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/disas.c b/disas.c > index fde5029..937e08b 100644 > --- a/disas.c > +++ b/disas.c > @@ -268,9 +268,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, > #elif defined(TARGET_S390X) > s.info.mach = bfd_mach_s390_64; > s.info.print_insn = print_insn_s390; > -#elif defined(TARGET_MICROBLAZE) > - s.info.mach = bfd_arch_microblaze; > - s.info.print_insn = print_insn_microblaze; > #elif defined(TARGET_MOXIE) > s.info.mach = bfd_arch_moxie; > s.info.print_insn = print_insn_moxie; > diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c > index 67e3182..89b8363 100644 > --- a/target-microblaze/cpu.c > +++ b/target-microblaze/cpu.c > @@ -111,6 +111,12 @@ static void mb_cpu_reset(CPUState *s) > #endif > } > > +static void mb_disas_set_info(CPUState *cpu, disassemble_info *info) > +{ > + info->mach = bfd_arch_microblaze; > + info->print_insn = print_insn_microblaze; > +} > + > static void mb_cpu_realizefn(DeviceState *dev, Error **errp) > { > CPUState *cs = CPU(dev); > @@ -183,6 +189,8 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data) > dc->vmsd = &vmstate_mb_cpu; > dc->props = mb_properties; > cc->gdb_num_core_regs = 32 + 5; > + > + cc->disas_set_info = mb_disas_set_info; > } > > static const TypeInfo mb_cpu_type_info = { > -- > 1.9.1 > >