From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76918C04AB5 for ; Thu, 6 Jun 2019 18:01:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C45020868 for ; Thu, 6 Jun 2019 18:01:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="XIocGkdb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C45020868 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:36124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYwi1-00028J-EK for qemu-devel@archiver.kernel.org; Thu, 06 Jun 2019 14:01:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYwU8-0004V9-NL for qemu-devel@nongnu.org; Thu, 06 Jun 2019 13:47:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYwU7-0004Aw-2J for qemu-devel@nongnu.org; Thu, 06 Jun 2019 13:47:32 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:36296) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYwU6-00036z-MC for qemu-devel@nongnu.org; Thu, 06 Jun 2019 13:47:30 -0400 Received: by mail-wm1-x343.google.com with SMTP id u8so827480wmm.1 for ; Thu, 06 Jun 2019 10:46:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nUY4whzXyU6WP8ecPGM+NaX0pvWgHVw5NXfobszfOy8=; b=XIocGkdbUohjdpc4QxP5z6w9olsbcw6lZk/w7nNiQQ0tCw5AGHYVhb9Ft0HOsE7vsN WvKY73o4Z5L6o6xkIqug2FfZZViFPQVDuS4KwNov2mN9QzBQchsEmoaxyI+6W8nq7TFU N1ir+JJSokfXkGORffm5FmKV6uTTl+KA6uEKuZf06gxNdry6xSw65WpUrTt/xYcViDre 2cn/amSOFjgXBQzaQNsQ9M0mmC31vm6gZRzaRimvHJVe8IEJ5iL5qfocqC8kpByprYhe AXllxYSrVrVL/R1pl51kX/L3wMGuMkAjUZrqGVfp9kOmU++DnBEnLwagyyEnB3oSIGCi 0uSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nUY4whzXyU6WP8ecPGM+NaX0pvWgHVw5NXfobszfOy8=; b=A7pZUg296QxVHWuGSAO5Zmzc1SjG6OeX6DvNxRE2MkqOek2EJiTWr1557JJ9zMfQGY s6w8e6nOdTXPvL2o3mmqaymxXUew/4e7B0S12Gylp6oEp0tLuzxCL2eWT3OMYvg/VHPu B5qm+mpG0BRgaiKfE+NlSV/zj2FhHkXHeD0aRBRye+5lOARbvA2qpK2EQvcdPTzly3oQ zfFdFbV9QXUuiscxWeKflO8mi1IjFwpLiuzAljkRjFO3T1Uym21ccfIPe7PaA1GmWJmZ LKalWJVV7NTjECxcH68hwFQ0RzI1kMFAsPwzjP23hF+HbMX0t2VacgSqPuUXTLM0A7Dk 8E5A== X-Gm-Message-State: APjAAAWZmQc2fSXpjIQMcIxqp1VZpXYCRweqIg0ftmyBAcjlDw+srji2 iaI+CRgTuhCINb2LqVJSKZd0/Q== X-Google-Smtp-Source: APXvYqwwc9TDH0UDF7WFTC8zm2We7QQX3POscAnpkXYWgY6BeOaAT3HCFYyWe+xvH+5m7ilEEUrKxA== X-Received: by 2002:a7b:c057:: with SMTP id u23mr825826wmc.29.1559843196978; Thu, 06 Jun 2019 10:46:36 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id z135sm2596784wmc.45.2019.06.06.10.46.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jun 2019 10:46:36 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 18:45:50 +0100 Message-Id: <20190606174609.20487-24-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190606174609.20487-1-peter.maydell@linaro.org> References: <20190606174609.20487-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH 23/42] target/arm: Convert VNMUL to decodetree X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Convert the VNMUL instruction to decodetree. Signed-off-by: Peter Maydell --- target/arm/translate-vfp.inc.c | 24 ++++++++++++++++++++++++ target/arm/translate.c | 7 +------ target/arm/vfp.decode | 5 +++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/target/arm/translate-vfp.inc.c b/target/arm/translate-vfp.inc.c index a2afe82b349..4c684f033b6 100644 --- a/target/arm/translate-vfp.inc.c +++ b/target/arm/translate-vfp.inc.c @@ -1427,3 +1427,27 @@ static bool trans_VMUL_dp(DisasContext *s, arg_VMUL_sp *a) { return do_vfp_3op_dp(s, gen_helper_vfp_muld, a->vd, a->vn, a->vm, false); } + +static void gen_VNMUL_sp(TCGv_i32 vd, TCGv_i32 vn, TCGv_i32 vm, TCGv_ptr fpst) +{ + /* VNMUL: -(fn * fm) */ + gen_helper_vfp_muls(vd, vn, vm, fpst); + gen_helper_vfp_negs(vd, vd); +} + +static bool trans_VNMUL_sp(DisasContext *s, arg_VNMUL_sp *a) +{ + return do_vfp_3op_sp(s, gen_VNMUL_sp, a->vd, a->vn, a->vm, false); +} + +static void gen_VNMUL_dp(TCGv_i64 vd, TCGv_i64 vn, TCGv_i64 vm, TCGv_ptr fpst) +{ + /* VNMUL: -(fn * fm) */ + gen_helper_vfp_muld(vd, vn, vm, fpst); + gen_helper_vfp_negd(vd, vd); +} + +static bool trans_VNMUL_dp(DisasContext *s, arg_VNMUL_sp *a) +{ + return do_vfp_3op_dp(s, gen_VNMUL_dp, a->vd, a->vn, a->vm, false); +} diff --git a/target/arm/translate.c b/target/arm/translate.c index 226f1006ced..23addcf53d6 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -1388,7 +1388,6 @@ static inline void gen_vfp_##name(int dp) \ VFP_OP2(add) VFP_OP2(sub) -VFP_OP2(mul) VFP_OP2(div) #undef VFP_OP2 @@ -3112,7 +3111,7 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) rn = VFP_SREG_N(insn); switch (op) { - case 0 ... 4: + case 0 ... 5: /* Already handled by decodetree */ return 1; default: @@ -3298,10 +3297,6 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) for (;;) { /* Perform the calculation. */ switch (op) { - case 5: /* nmul: -(fn * fm) */ - gen_vfp_mul(dp); - gen_vfp_neg(dp); - break; case 6: /* add: fn + fm */ gen_vfp_add(dp); break; diff --git a/target/arm/vfp.decode b/target/arm/vfp.decode index d7fcb9709a9..3063fcac23f 100644 --- a/target/arm/vfp.decode +++ b/target/arm/vfp.decode @@ -122,3 +122,8 @@ VMUL_sp ---- 1110 0.10 .... .... 1010 .0.0 .... \ vm=%vm_sp vn=%vn_sp vd=%vd_sp VMUL_dp ---- 1110 0.10 .... .... 1011 .0.0 .... \ vm=%vm_dp vn=%vn_dp vd=%vd_dp + +VNMUL_sp ---- 1110 0.10 .... .... 1010 .1.0 .... \ + vm=%vm_sp vn=%vn_sp vd=%vd_sp +VNMUL_dp ---- 1110 0.10 .... .... 1011 .1.0 .... \ + vm=%vm_dp vn=%vn_dp vd=%vd_dp -- 2.20.1