From patchwork Tue Jun 11 10:53:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 166417 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2242136ilk; Tue, 11 Jun 2019 04:39:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqyBDxyfavjNJvbCUsVQ8ItUr4T2PHrJ8V4Lxdg8fe3PG7VFdKpvPxxPBamCuWbpzbpgf4ks X-Received: by 2002:a37:aa4d:: with SMTP id t74mr61026068qke.144.1560253152130; Tue, 11 Jun 2019 04:39:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560253152; cv=none; d=google.com; s=arc-20160816; b=Tkqkl4B8FGQMBZLjrWTkyRMKKrNHnu+EjkMoVzYPIjXoGRhyj6Zu6FKXYeDQITOwv0 k/SVf/xWZGHJqweNxgRLeRvmOSpWXhQjW9n6hSpZAM3288herUunsBuEi7xxntq6tbot FmwQE5xrblsRYSLE1QVIPvBywNX0RRY/06IlmZkqhHSA/WyzVDKl70CU0WvTu8TLacyP 6MMFqsDJQSzBEVRFKviwS5Bofcph85vd/+sIZj+l5cVEZcWVgRra6Xfrl2lhQYaLL97N KFIGRd7mgEgo/GzLV425lXhnzImnsQqYFuftoNDtq1WTG7NKWy9eIA7j8FnZYX2FlFg3 ceeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=8DDr7wU5Mf7FhJNHoQYd6MgxVhRgKHpZJzl/r4VHltc=; b=A177hXryp1x7WjZn6AA17L6TtEKNJ7lwb6FUXDIcDi43FNjiALTRCh+q81ddwpJ+Za ZT3HV7ZZbKLCtM37/pih0BOAWFoZp0EXn5ghixmpWInZNuK5WJNOXq1aHXMotm/u0ik9 HBn+cEu6v3YbYHgBVnjC0Bkkrt/HHRnNYfAHnx/n7RdJSDWI4os7WYWtzqcTVAZ4+BDG QbMZwDZflApIr1s83XXGMLbLjOVTBalJjy8ML5dPmcTYWW/nw4CCF1OBqk5TvhthUl2h Uptw/687rVBlSRUeQ31mo9/84DVZFl2gXIqu/fk63Fh+Z9cQ25/o274JIytzDTuqwQzo 91vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sWJ2XzSX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c25si6339259qta.234.2019.06.11.04.39.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jun 2019 04:39:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sWJ2XzSX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56540 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haf7N-00058l-RI for patch@linaro.org; Tue, 11 Jun 2019 07:39:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39580) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haeQN-0007Y1-9l for qemu-devel@nongnu.org; Tue, 11 Jun 2019 06:54:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1haeQK-0007qb-KA for qemu-devel@nongnu.org; Tue, 11 Jun 2019 06:54:43 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:39799) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1haeQK-0007lw-9Q for qemu-devel@nongnu.org; Tue, 11 Jun 2019 06:54:40 -0400 Received: by mail-wm1-x341.google.com with SMTP id z23so2381268wma.4 for ; Tue, 11 Jun 2019 03:54:36 -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=8DDr7wU5Mf7FhJNHoQYd6MgxVhRgKHpZJzl/r4VHltc=; b=sWJ2XzSXfgOq+HIiZxOjagrZLTKeBuNbzyT1ZEMWS1B3XcZYRuCWS4DG0t/5Rmcmrf Hs1rqcUGn7W8KOxqzpaF7WU5nI+pgqY0VP8FVmEwFYIYN2Aq8CPCbinDVjC5s4qoftRS Yw5X2JLClSRNtH8JTIbHoqC7+f1hl1gI3ljq1sByRq/wL0kVheS/AExR6iJp2SbgnWTk 2MdgGNVqjqDv8sKwNc8TWC7E0ahjclVhDvtdjfaZhQryBDeMpxJWN4i/V8TzrKN9mCrb 8kv5GcvvEG0D+CIl+LVT4KbryBrGz4wtDNj00Rk96Ubm3Vf+AHBFIAEu4ztgivxxyZGe B05Q== 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=8DDr7wU5Mf7FhJNHoQYd6MgxVhRgKHpZJzl/r4VHltc=; b=gExMgTPqMRM15jbtUmlEufsn6tfVTsz3ZIrswSNisGEXBezWvb12rA6SCPDufQqT7R U/KSjp/cYq1ePM55knn9uPhw31+pRx3i+pX7OIJfFqs82AfyyqynQJdz/KoqYUxdrQeM xhOzoAeqR5YBXhBwAMbxPLboPxKBCSwSV4iklh3t3d9yf0SjFgSElcYPqy317tpZ10Pg YTfh1ehpG4Rz0fAOgvggJZfIhEG4rPigfCk8zIuuOk6HEusFSMWh89zLfGSonKa1mIEg S3Hvg9xrc02fPRJGWkTDLWHUoHGWuUOG9Xat7liwM/Ob34XP6kqJ9DjeFk5Ys7rGPnj+ qwnA== X-Gm-Message-State: APjAAAVRsrIywA5fuoe2Faq4uGaTZ8pAWcOaokKmMx3fepD6r341Pu+P tOcHY72yVrBD/mNUWP0tlfTIPq+IM+WHhg== X-Received: by 2002:a1c:e009:: with SMTP id x9mr17209422wmg.5.1560250475482; Tue, 11 Jun 2019 03:54:35 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e17sm10785945wrt.95.2019.06.11.03.54.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jun 2019 03:54:35 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Tue, 11 Jun 2019 11:53:48 +0100 Message-Id: <20190611105351.9871-40-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190611105351.9871-1-peter.maydell@linaro.org> References: <20190611105351.9871-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v2 39/42] target/arm: Convert VJCVT to decodetree X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Convert the VJCVT instruction to decodetree. Signed-off-by: Peter Maydell --- target/arm/translate-vfp.inc.c | 28 ++++++++++++++++++++++++++++ target/arm/translate.c | 12 +----------- target/arm/vfp.decode | 4 ++++ 3 files changed, 33 insertions(+), 11 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/target/arm/translate-vfp.inc.c b/target/arm/translate-vfp.inc.c index cc3f61d9c41..161f0fdd888 100644 --- a/target/arm/translate-vfp.inc.c +++ b/target/arm/translate-vfp.inc.c @@ -2426,3 +2426,31 @@ static bool trans_VCVT_int_dp(DisasContext *s, arg_VCVT_int_dp *a) tcg_temp_free_ptr(fpst); return true; } + +static bool trans_VJCVT(DisasContext *s, arg_VJCVT *a) +{ + TCGv_i32 vd; + TCGv_i64 vm; + + if (!dc_isar_feature(aa32_jscvt, s)) { + return false; + } + + /* UNDEF accesses to D16-D31 if they don't exist. */ + if (!dc_isar_feature(aa32_fp_d32, s) && (a->vm & 0x10)) { + return false; + } + + if (!vfp_access_check(s)) { + return true; + } + + vm = tcg_temp_new_i64(); + vd = tcg_temp_new_i32(); + neon_load_reg64(vm, a->vm); + gen_helper_vjcvt(vd, vm, cpu_env); + neon_store_reg32(vd, a->vd); + tcg_temp_free_i64(vm); + tcg_temp_free_i32(vd); + return true; +} diff --git a/target/arm/translate.c b/target/arm/translate.c index 1e28308aa6a..99b436ad6f7 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -3050,7 +3050,7 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) return 1; case 15: switch (rn) { - case 0 ... 17: + case 0 ... 19: /* Already handled by decodetree */ return 1; default: @@ -3085,13 +3085,6 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) rm_is_dp = false; break; - case 0x13: /* vjcvt */ - if (!dp || !dc_isar_feature(aa32_jscvt, s)) { - return 1; - } - rd_is_dp = false; - break; - default: return 1; } @@ -3177,9 +3170,6 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) switch (op) { case 15: /* extension space */ switch (rn) { - case 19: /* vjcvt */ - gen_helper_vjcvt(cpu_F0s, cpu_F0d, cpu_env); - break; case 20: /* fshto */ gen_vfp_shto(dp, 16 - rm, 0); break; diff --git a/target/arm/vfp.decode b/target/arm/vfp.decode index 6da9a7913da..1a7c9b533de 100644 --- a/target/arm/vfp.decode +++ b/target/arm/vfp.decode @@ -220,3 +220,7 @@ VCVT_int_sp ---- 1110 1.11 1000 .... 1010 s:1 1.0 .... \ vd=%vd_sp vm=%vm_sp VCVT_int_dp ---- 1110 1.11 1000 .... 1011 s:1 1.0 .... \ vd=%vd_dp vm=%vm_sp + +# VJCVT is always dp to sp +VJCVT ---- 1110 1.11 1001 .... 1011 11.0 .... \ + vd=%vd_sp vm=%vm_dp