From patchwork Wed Jun 24 03:57:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 487940 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D2AF5140081 for ; Wed, 24 Jun 2015 14:00:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=tzhHRg79; dkim-atps=neutral Received: from localhost ([::1]:48459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7brM-0005d1-33 for incoming@patchwork.ozlabs.org; Wed, 24 Jun 2015 00:00:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56354) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7bow-0001BP-Vr for qemu-devel@nongnu.org; Tue, 23 Jun 2015 23:57:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7bot-0007qa-QF for qemu-devel@nongnu.org; Tue, 23 Jun 2015 23:57:54 -0400 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]:36159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7bot-0007qP-JC for qemu-devel@nongnu.org; Tue, 23 Jun 2015 23:57:51 -0400 Received: by paceq1 with SMTP id eq1so20224141pac.3 for ; Tue, 23 Jun 2015 20:57:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Dy1J0v86Zec2fgcMC4moUJTLSZ3XyOBH5K2fPDp4AIw=; b=tzhHRg79qNgO1o5Arn6Y+8Vl4rSZEL2ODM22Ke9D6FB0G1vLAqXTIhcWPPqu+vptrx 42seq5r/MyL0RYPSYZDi06OL3doUsRuMIpJjut9gMwZ/n+8niKKfKDgKtb3CLSzT2Cky Nh1NN3DiYTxTnyiR9P1KMZ9fc7NVKnwf3B5PFfKgGrcDreGdHq0KkMvbW+FIA8rLS4ie ybeIaSEiZmqBZNF1lK7fHzukyqf8XG5fc0SzDrkUb/wbUVZVknSk35fd+rVMhpFryhmh x5TbiHyMJLFoLZFyHL8HtZOO86FPmkcsV2LDNE6t9HQT8IQVdhni5aergyl5fN3AYwu/ 3KfA== X-Received: by 10.68.219.42 with SMTP id pl10mr76471709pbc.154.1435118270710; Tue, 23 Jun 2015 20:57:50 -0700 (PDT) Received: from pcrost-laptop.hsd1.ca.comcast.net (c-73-15-58-35.hsd1.ca.comcast.net. [73.15.58.35]) by mx.google.com with ESMTPSA id af5sm24861481pbc.90.2015.06.23.20.57.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Jun 2015 20:57:49 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Tue, 23 Jun 2015 20:57:36 -0700 Message-Id: <8b16aff59c08a4d11f3dfc14a1e4b252e9ee1e3a.1435117090.git.crosthwaite.peter@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22f Cc: peter.maydell@linaro.org, Peter Crosthwaite , claudio.fontana@huawei.com, edgar.iglesias@gmail.com, afaerber@suse.de, rth@twiddle.net Subject: [Qemu-devel] [PATCH qom v4 5/7] disas: microblaze: QOMify target specific disas setup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Edgar E. Iglesias --- 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 c592bf7..36d3642 100644 --- a/target-microblaze/cpu.c +++ b/target-microblaze/cpu.c @@ -119,6 +119,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); @@ -256,6 +262,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 = {