From patchwork Mon Jun 9 14:57:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 31572 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f200.google.com (mail-yk0-f200.google.com [209.85.160.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DD9E121330 for ; Mon, 9 Jun 2014 15:02:24 +0000 (UTC) Received: by mail-yk0-f200.google.com with SMTP id 20sf698944yks.3 for ; Mon, 09 Jun 2014 08:02:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=pKjyQLxjEpn1OSLU+/W/3VE+6/G3y3M68cJXjrzUG+w=; b=Zjas+BqPtSwNrOQra45eMvSA1gwoavmVk9tA3Qq9G32CFcFhk9ZDiWawtXYoPt7Nng oRfhHZxUd3GaBe6dzPN+Eycr9y4ExylXoeUgkTAFJSWLxaJpxkVV+IMz2ROUUhSLH3lM 2Qs9zskDp2SSjR7MM6nHydgFsuXiefDsxefZxua3DfTYbH6bRKPu2jnQquM0Awpv02mn yoX9utRyPwNUfdp6CvohvUv3eHPqmHSzET0OuZENyVDYCd7uHLzqyL0zhzJQf8MeQbDP rp1wwX39NMqtx1l8IMo0sx/mZ+n1xoXY8veHkT9163jUYYoChlZA0Nv+k1LwB7nTZUx/ lzlw== X-Gm-Message-State: ALoCoQntmbkr0k6i2gwEMjZ10StbyimEQQ39bwMWKyF3ecVHnjO+tKhbjxuwBmzNjBVLUg2YGet0 X-Received: by 10.58.135.130 with SMTP id ps2mr13965831veb.8.1402326144610; Mon, 09 Jun 2014 08:02:24 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.32.203 with SMTP id h69ls1736762qgh.56.gmail; Mon, 09 Jun 2014 08:02:24 -0700 (PDT) X-Received: by 10.220.183.4 with SMTP id ce4mr2131949vcb.54.1402326144429; Mon, 09 Jun 2014 08:02:24 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id qe9si10703523vcb.79.2014.06.09.08.02.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Jun 2014 08:02:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.174 as permitted sender) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id us18so4509506veb.33 for ; Mon, 09 Jun 2014 08:02:24 -0700 (PDT) X-Received: by 10.220.44.141 with SMTP id a13mr825381vcf.71.1402326144341; Mon, 09 Jun 2014 08:02:24 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp152538vcb; Mon, 9 Jun 2014 08:02:24 -0700 (PDT) X-Received: by 10.140.24.98 with SMTP id 89mr31166155qgq.33.1402326142392; Mon, 09 Jun 2014 08:02:22 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v41si23390247qge.21.2014.06.09.08.02.22 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 09 Jun 2014 08:02:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:33605 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu15Z-0003Xc-Vs for patch@linaro.org; Mon, 09 Jun 2014 11:02:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu116-00053O-4S for qemu-devel@nongnu.org; Mon, 09 Jun 2014 10:57:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wu115-0005gJ-9o for qemu-devel@nongnu.org; Mon, 09 Jun 2014 10:57:44 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu115-0005dP-3P for qemu-devel@nongnu.org; Mon, 09 Jun 2014 10:57:43 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Wu110-0006A4-HN for qemu-devel@nongnu.org; Mon, 09 Jun 2014 15:57:38 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 9 Jun 2014 15:57:27 +0100 Message-Id: <1402325858-23615-10-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1402325858-23615-1-git-send-email-peter.maydell@linaro.org> References: <1402325858-23615-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 09/20] target-arm: A64: Use PMULL feature bit for PMULL 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Now that we have a separate ARM_FEATURE_V8_PMULL bit, use it for the A64 PMULL, not the AES feature bit. Signed-off-by: Peter Maydell --- linux-user/elfload.c | 2 +- target-arm/translate-a64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 3241fec..e872493 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -539,7 +539,7 @@ static uint32_t get_elf_hwcap(void) /* probe for the extra features */ #define GET_FEATURE(feat, hwcap) \ do { if (arm_feature(&cpu->env, feat)) { hwcaps |= hwcap; } } while (0) - GET_FEATURE(ARM_FEATURE_V8_AES, ARM_HWCAP_A64_PMULL); + GET_FEATURE(ARM_FEATURE_V8_PMULL, ARM_HWCAP_A64_PMULL); #undef GET_FEATURE return hwcaps; diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index a9c4633..9832cc3 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -8574,7 +8574,7 @@ static void disas_simd_three_reg_diff(DisasContext *s, uint32_t insn) return; } if (size == 3) { - if (!arm_dc_feature(s, ARM_FEATURE_V8_AES)) { + if (!arm_dc_feature(s, ARM_FEATURE_V8_PMULL)) { unallocated_encoding(s); return; }