From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrB62-0004Yx-IZ for qemu-devel@nongnu.org; Sat, 09 May 2015 16:11:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YrB61-0007kT-Lx for qemu-devel@nongnu.org; Sat, 09 May 2015 16:11:38 -0400 Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]:33188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrB61-0007kP-Fv for qemu-devel@nongnu.org; Sat, 09 May 2015 16:11:37 -0400 Received: by pacwv17 with SMTP id wv17so77418439pac.0 for ; Sat, 09 May 2015 13:11:36 -0700 (PDT) From: Peter Crosthwaite Date: Sat, 9 May 2015 13:11:15 -0700 Message-Id: <7a0432a8431635b20b50c31e23a521c030ebef8e.1431200693.git.crosthwaite.peter@gmail.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v2 5/7] disas: microblaze: QOMify target specific disas setup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, edgari@xilinx.com, rth@twiddle.net, claudio.fontana@huawei.com, edgar.iglesias@gmail.com 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 1700537..087f4b4 100644 --- a/disas.c +++ b/disas.c @@ -269,9 +269,6 @@ void target_disas(FILE *out, CPUArchState *env, 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