From patchwork Wed Oct 21 13:52:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 36602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 80C28B7BFF for ; Thu, 22 Oct 2009 01:58:40 +1100 (EST) Received: from localhost ([127.0.0.1]:50645 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0ce4-00048G-O2 for incoming@patchwork.ozlabs.org; Wed, 21 Oct 2009 10:58:36 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N0bbs-0005Mt-Rq for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:52:17 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N0bbj-0005EJ-Ud for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:52:13 -0400 Received: from [199.232.76.173] (port=37605 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0bbj-0005Dz-L7 for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:52:07 -0400 Received: from cantor2.suse.de ([195.135.220.15]:50276 helo=mx2.suse.de) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N0bbj-0005NE-7H for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:52:07 -0400 Received: from relay2.suse.de (mail2.suse.de [195.135.221.8]) by mx2.suse.de (Postfix) with ESMTP id E87AB89471; Wed, 21 Oct 2009 15:52:04 +0200 (CEST) From: Ulrich Hecht To: aurelien@aurel32.net Date: Wed, 21 Oct 2009 15:52:23 +0200 Message-Id: <1256133153-3121-3-git-send-email-uli@suse.de> X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <1256133153-3121-2-git-send-email-uli@suse.de> References: <1256133153-3121-1-git-send-email-uli@suse.de> <1256133153-3121-2-git-send-email-uli@suse.de> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: riku.voipio@iki.fi, qemu-devel@nongnu.org, agraf@suse.de Subject: [Qemu-devel] [PATCH 02/12] S/390 disassembler fixes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org enable zArch (64-bit) instructions enable disassembler for both s390 and s390x Signed-off-by: Ulrich Hecht --- configure | 2 +- disas.c | 3 +++ s390-dis.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure b/configure index ca6d45c..350c742 100755 --- a/configure +++ b/configure @@ -2386,7 +2386,7 @@ for i in $ARCH $TARGET_BASE_ARCH ; do ppc*) echo "CONFIG_PPC_DIS=y" >> $config_target_mak ;; - s390) + s390*) echo "CONFIG_S390_DIS=y" >> $config_target_mak ;; sh4) diff --git a/disas.c b/disas.c index ce342bc..14c8901 100644 --- a/disas.c +++ b/disas.c @@ -195,6 +195,9 @@ void target_disas(FILE *out, target_ulong code, target_ulong size, int flags) #elif defined(TARGET_CRIS) disasm_info.mach = bfd_mach_cris_v32; print_insn = print_insn_crisv32; +#elif defined(TARGET_S390X) + disasm_info.mach = bfd_mach_s390_64; + print_insn = print_insn_s390; #elif defined(TARGET_MICROBLAZE) disasm_info.mach = bfd_arch_microblaze; print_insn = print_insn_microblaze; diff --git a/s390-dis.c b/s390-dis.c index 86dd84f..9a73a57 100644 --- a/s390-dis.c +++ b/s390-dis.c @@ -191,10 +191,10 @@ init_disasm (struct disassemble_info *info) // switch (info->mach) // { // case bfd_mach_s390_31: - current_arch_mask = 1 << S390_OPCODE_ESA; +// current_arch_mask = 1 << S390_OPCODE_ESA; // break; // case bfd_mach_s390_64: -// current_arch_mask = 1 << S390_OPCODE_ZARCH; + current_arch_mask = 1 << S390_OPCODE_ZARCH; // break; // default: // abort ();