From patchwork Sun Jul 12 01:59:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 494064 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 3D3151402B6 for ; Sun, 12 Jul 2015 12:02:36 +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=paRI//gz; dkim-atps=neutral Received: from localhost ([::1]:49523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZE6bC-0002To-C4 for incoming@patchwork.ozlabs.org; Sat, 11 Jul 2015 22:02:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZE6Z2-0006ij-Hw for qemu-devel@nongnu.org; Sat, 11 Jul 2015 22:00:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZE6Yx-0008Ju-He for qemu-devel@nongnu.org; Sat, 11 Jul 2015 22:00:20 -0400 Received: from mail-pd0-x22f.google.com ([2607:f8b0:400e:c02::22f]:35230) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZE6Yx-0008Ji-AD for qemu-devel@nongnu.org; Sat, 11 Jul 2015 22:00:15 -0400 Received: by pdrg1 with SMTP id g1so72412671pdr.2 for ; Sat, 11 Jul 2015 19:00:14 -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=ufBfQQNCHLUgV51IcRky9vagnN7io5ur2kVr4siUkcI=; b=paRI//gzaTfrIro6+YXh3dAOdvy9+2tDlHOvQ5dsIRU2JQ3BKkOtKzijAkh/ZBsWW7 re6CSk4T43A7GTi5Ufzg4Aabi//w9RP1cgnK0/S36rTFLefoZ3eJ7ZXSfMfKlqzb0Xd5 EkQIuL9f0LF21vmVO5pVkVWVHG8ycq7pQMxrEpFF0a3hbVMeOtWPekboJiDEq+7V0esS xtgZx6FQDEbAHA2PNGhxTS2Rq+IXUcZNJBNBeSwNEodP4T+iWdVA7eDtesLiy8SHEiuv TPL//RAJk1KlVV4D3ha4/Al2M5Cq4wHrIf7xbRjGmTcHDZLy1MmYFN1lPKAc6Z84uuzg X5bg== X-Received: by 10.70.129.143 with SMTP id nw15mr55596583pdb.101.1436666414483; Sat, 11 Jul 2015 19:00:14 -0700 (PDT) Received: from pcrost-laptop.hsd1.ca.comcast.net (c-73-15-58-35.hsd1.ca.comcast.net. [73.15.58.35]) by smtp.gmail.com with ESMTPSA id ia3sm13842784pbc.31.2015.07.11.19.00.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 11 Jul 2015 19:00:13 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Sat, 11 Jul 2015 18:59:58 -0700 Message-Id: <576c9c4963c04acf7a7e7054d690978c16b52c68.1436665556.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:c02::22f Cc: Alexander Graf , Peter Crosthwaite , Peter Crosthwaite , afaerber@suse.de, Richard Henderson Subject: [Qemu-devel] [PATCH 1/8] disas: s390x: 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 From: Peter Crosthwaite Move the target_disas() s390 specifics to the QOM disas_set_info hook and delete the #ifdef specific code in disas.c. Cc: Richard Henderson Cc: Alexander Graf Signed-off-by: Peter Crosthwaite --- Testing: $ ./s390x-softmmu/qemu-system-s390x -nographic -d in_asm -S 2> err QEMU 2.3.90 monitor - type 'help' for more information (qemu) info register unknown command: 'register' (qemu) info registers PSW=mask 0000000180000000 addr 0000000007e00468 cc 00 ... (qemu) x/i 0x7e00468 0x0000000007e00468: larl %r15,0x7e0d000 (qemu) x/i 0x7e0046e 0x0000000007e0046e: larl %r6,0x7e15000 (qemu) c (qemu) No virtio-blk device found! $ more err IN: 0x0000000007e00468: larl %r15,0x7e0d000 0x0000000007e0046e: larl %r6,0x7e15000 0x0000000007e00474: stg %r7,0(%r6) 0x0000000007e0047a: j 0x7e0052c ... --- disas.c | 6 ------ target-s390x/cpu.c | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/disas.c b/disas.c index 69a6066..e62c934 100644 --- a/disas.c +++ b/disas.c @@ -257,9 +257,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, #elif defined(TARGET_ALPHA) s.info.mach = bfd_mach_alpha_ev6; s.info.print_insn = print_insn_alpha; -#elif defined(TARGET_S390X) - s.info.mach = bfd_mach_s390_64; - s.info.print_insn = print_insn_s390; #elif defined(TARGET_MOXIE) s.info.mach = bfd_arch_moxie; s.info.print_insn = print_insn_moxie; @@ -480,9 +477,6 @@ void monitor_disas(Monitor *mon, CPUState *cpu, #elif defined(TARGET_SH4) s.info.mach = bfd_mach_sh4; s.info.print_insn = print_insn_sh; -#elif defined(TARGET_S390X) - s.info.mach = bfd_mach_s390_64; - s.info.print_insn = print_insn_s390; #elif defined(TARGET_MOXIE) s.info.mach = bfd_arch_moxie; s.info.print_insn = print_insn_moxie; diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index c3e21b4..471c6a7 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -184,6 +184,12 @@ static void s390_cpu_machine_reset_cb(void *opaque) } #endif +static void s390_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) +{ + info->mach = bfd_mach_s390_64; + info->print_insn = print_insn_s390; +} + static void s390_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); @@ -353,6 +359,8 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) #endif cc->gdb_num_core_regs = S390_NUM_CORE_REGS; cc->gdb_core_xml_file = "s390x-core64.xml"; + + cc->disas_set_info = s390_cpu_disas_set_info; } static const TypeInfo s390_cpu_type_info = {