From patchwork Sun Apr 17 16:14:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 91562 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 54C04B6FD7 for ; Mon, 18 Apr 2011 02:15:14 +1000 (EST) Received: from localhost ([::1]:38976 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBUcw-0006D2-Vm for incoming@patchwork.ozlabs.org; Sun, 17 Apr 2011 12:15:10 -0400 Received: from eggs.gnu.org ([140.186.70.92]:48318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBUcg-0006BC-8E for qemu-devel@nongnu.org; Sun, 17 Apr 2011 12:14:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QBUce-0007DS-LK for qemu-devel@nongnu.org; Sun, 17 Apr 2011 12:14:54 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:58884) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBUce-0007DC-Ev for qemu-devel@nongnu.org; Sun, 17 Apr 2011 12:14:52 -0400 Received: by pxi15 with SMTP id 15so8611426pxi.33 for ; Sun, 17 Apr 2011 09:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=eFcuhu42ClxVGJ0/rCXmuxJFdfDwe/RTXI7F8islqns=; b=atBKtxOLFm8z7cubBJoQQgKoP74a0bA9QNOB9upRX6QqBLQUCk3H3qdl5jTLnpiSB0 HDuuoeKEUNpG9gn5N8vsNel0v8jew7rJAMeB/d6JXzPNCG30/h21rlWK5LhbnJrVsczy Nwa0fGxESO/LndS3pja9W/1hdAeDvxu+1yfok= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=B6ReihXfRXATnZGf0/3ZqF6KmN8swvKHo11nw/lfZHXjb7CA3/FCzyOAZLEXhTwO6q GKvtgd5qBe2k0KfSH/CZ7cl6MueS4HCnzJIs77EM9ppxcFrLk/HSbf2a4e9zLhTB0Tvy R/40dea4aiJ+rTuG5Hhva5N3OZrmzv7NctzUM= Received: by 10.68.43.5 with SMTP id s5mr5430069pbl.162.1303056891793; Sun, 17 Apr 2011 09:14:51 -0700 (PDT) Received: from localhost.localdomain (are.twiddle.net [75.101.38.216]) by mx.google.com with ESMTPS id t7sm1733194pbh.30.2011.04.17.09.14.50 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 17 Apr 2011 09:14:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 17 Apr 2011 09:14:33 -0700 Message-Id: <1303056876-14320-3-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.2 In-Reply-To: <1303056876-14320-1-git-send-email-rth@twiddle.net> References: <1303056876-14320-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.212.174 Subject: [Qemu-devel] [PATCH 2/5] target-alpha: Disassemble EV6 PALcode instructions. 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 The QEMU emulation PALcode will use EV6 PALcode insns regardless of the "real" cpu instruction set being emulated. Signed-off-by: Richard Henderson --- alpha-dis.c | 4 ---- dis-asm.h | 3 +++ disas.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/alpha-dis.c b/alpha-dis.c index 8a2411e..ae331b3 100644 --- a/alpha-dis.c +++ b/alpha-dis.c @@ -238,10 +238,6 @@ extern const unsigned alpha_num_operands; #define AXP_REG_SP 30 #define AXP_REG_ZERO 31 -#define bfd_mach_alpha_ev4 0x10 -#define bfd_mach_alpha_ev5 0x20 -#define bfd_mach_alpha_ev6 0x30 - enum bfd_reloc_code_real { BFD_RELOC_23_PCREL_S2, BFD_RELOC_ALPHA_HINT diff --git a/dis-asm.h b/dis-asm.h index 296537a..5b07d7f 100644 --- a/dis-asm.h +++ b/dis-asm.h @@ -184,6 +184,9 @@ enum bfd_architecture #define bfd_mach_sh5 0x50 bfd_arch_alpha, /* Dec Alpha */ #define bfd_mach_alpha 1 +#define bfd_mach_alpha_ev4 0x10 +#define bfd_mach_alpha_ev5 0x20 +#define bfd_mach_alpha_ev6 0x30 bfd_arch_arm, /* Advanced Risc Machines ARM */ #define bfd_mach_arm_unknown 0 #define bfd_mach_arm_2 1 diff --git a/disas.c b/disas.c index 223606c..d208c52 100644 --- a/disas.c +++ b/disas.c @@ -205,7 +205,7 @@ void target_disas(FILE *out, target_ulong code, target_ulong size, int flags) disasm_info.mach = bfd_mach_sh4; print_insn = print_insn_sh; #elif defined(TARGET_ALPHA) - disasm_info.mach = bfd_mach_alpha; + disasm_info.mach = bfd_mach_alpha_ev6; print_insn = print_insn_alpha; #elif defined(TARGET_CRIS) if (flags != 32) {