From patchwork Thu Jun 13 12:14:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 166657 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp775765ilk; Thu, 13 Jun 2019 06:37:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqzV9ACajyevQ5EIfuOfZHCCyPAl9WMjEQ4IgbReR/udENpVOltuuurAT5773MEaSXgDTUSV X-Received: by 2002:a0c:b0e4:: with SMTP id p33mr3699361qvc.208.1560433049195; Thu, 13 Jun 2019 06:37:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560433049; cv=none; d=google.com; s=arc-20160816; b=kTtPmxN3g3jHDL/Cv6a05dmjgNWEOByGPFXtuQQkmi9snWRlnhMxRdjNp15ax22F4e dLI3DCI2aeIftWiMV04jAXZd4PYfSfdOU4bMTXrOY2btjntgsqPZ3Oq8AyNtPiQxpFgC /KJN3vIQllEp95jxcktXK9AXVSZQnRz3tzB7Pk/+tY2cTBvQfrItQXiHEyiHaV+J3sbG U5k3UeKDXJEmb7fr/m2WOx3U3cigA+wJE9VlxZYVAfKvNh/wkIb67NkeOg8bOAeJR+TP x+2JMgF0nbxbEa+y5amvbuQ4vwPyhxUHieLjf6cxS/Kf03tSGIs5pwh61q3GPlTvAoiC 8zLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=cM/krYcMONIsOnkfHxTnbrqFSYhnAz5GTPgsBXD7Q3Y=; b=kzV66+PcwyIZ3d+qCMXPfqwtOktYpXN/bX5FDrKMSFIOykbgrVzIhi3BE2A+kUQwrm xmiSbRpRR+gAWyGku/0bCoSPCXNXjIvsaGNiBwwXw/C4jlm7ImDNpaX+ueOhHcpCPTeC oDzVIA29imuR6qyD5Zv6Nbk6CsB7qmXqqS8NBVZ+wShm+aZHNQyU59rDM6vD1cB26rSo 0TNojFJDlBiAOSuy1ycQRkFGH1FBn0k05IDfBIZYEtTOMPurAgHBFqiC4Dh9bFTpmzsR m9AbcUdTe3kHI7d8hd4yn8Zv0g/DrByYb7cK887OChL6I7OEOCaEDrk0FAIaGqS7QGIn BCRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="gmd/724/"; 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 e22si2022190qte.250.2019.06.13.06.37.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Jun 2019 06:37:29 -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="gmd/724/"; 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]:39774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbPuy-0002DB-MO for patch@linaro.org; Thu, 13 Jun 2019 09:37:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60079) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbOeR-0000E4-L1 for qemu-devel@nongnu.org; Thu, 13 Jun 2019 08:16:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbOeI-0005SW-1J for qemu-devel@nongnu.org; Thu, 13 Jun 2019 08:16:15 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42618) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hbOeG-0004j5-1R for qemu-devel@nongnu.org; Thu, 13 Jun 2019 08:16:08 -0400 Received: by mail-wr1-x443.google.com with SMTP id x17so5235774wrl.9 for ; Thu, 13 Jun 2019 05:15:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=cM/krYcMONIsOnkfHxTnbrqFSYhnAz5GTPgsBXD7Q3Y=; b=gmd/724/HKFju8tHx+3ur+SFcX7iq5hEkYFuFLo7YxhY8PNqWm4QUTn5j4GrHerpyb 47Qds0+iD7RA7L6WDxSmK0ddAfVNj+fUFO7bu+di9FjpL8C0KY11XTIcmHky4nEJAy3U iV94550mYqeU+/uy3VyS0osdnDqKV6IS9qi+78ydn6OeOrYcrArgPBv3c7WtYDx5X5D8 alSUvoNEARlMW4cDD7P49pF3uc+/4WjcKRgHcAkbEnI2FH5UALmoL7XbuL83J30ZhatF fA96MCD/BvIMo6jqzRF7B1odM75bPLw2tWWCkkvpj1gCgj5RDM3PSTKUFQ9kaFv9yDYF oYYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cM/krYcMONIsOnkfHxTnbrqFSYhnAz5GTPgsBXD7Q3Y=; b=XYqPz8sx9hfzzIuZ4Fo9o8C45xFznZLeN/9p5gRKSmtdxK5eF77AZQ2lMZNplUA16x +sziCP+6abOp6SKs8LkGrYFBBsqIXcL9VuwULajRg4EHJBKvCJlJ8tGb0wFrUiWK1m2+ yX3Udfc8tgHnHTrN7GumNAdUBOvQCtl60SjcEeit24aAc+ReaUfPJI2bvVmsayvNGUxP eFqVHh+1fQ4XGdw+LhMWMUFC+FJdxQyC4SxIJ6MFLizstFD07tGWqPjspTwe8EG2bsk6 sLwQPTVdF4ahBMNsel668CSyFwt3V97KhEXyqDx1aXhvR1NrSYjBE5tvPHJT0Hy1fB96 LwTw== X-Gm-Message-State: APjAAAUll2U8TekbDri2PWiXheMY7TyFisW07V16jf3m7Z/mYw3w4oWz 30fd0lq2QkZ887h5r0BC/ohcUBlYnUC8nQ== X-Received: by 2002:adf:f181:: with SMTP id h1mr1583765wro.86.1560428122050; Thu, 13 Jun 2019 05:15:22 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id y6sm2010576wrp.12.2019.06.13.05.15.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jun 2019 05:15:21 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 13 Jun 2019 13:14:29 +0100 Message-Id: <20190613121433.5246-45-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190613121433.5246-1-peter.maydell@linaro.org> References: <20190613121433.5246-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::443 Subject: [Qemu-devel] [PULL 44/48] target/arm: Convert integer-to-float insns 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Convert the VCVT integer-to-float instructions to decodetree. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/translate-vfp.inc.c | 58 ++++++++++++++++++++++++++++++++++ target/arm/translate.c | 12 +------ target/arm/vfp.decode | 6 ++++ 3 files changed, 65 insertions(+), 11 deletions(-) -- 2.20.1 diff --git a/target/arm/translate-vfp.inc.c b/target/arm/translate-vfp.inc.c index c50093776b6..cc3f61d9c41 100644 --- a/target/arm/translate-vfp.inc.c +++ b/target/arm/translate-vfp.inc.c @@ -2368,3 +2368,61 @@ static bool trans_VCVT_dp(DisasContext *s, arg_VCVT_dp *a) tcg_temp_free_i64(vm); return true; } + +static bool trans_VCVT_int_sp(DisasContext *s, arg_VCVT_int_sp *a) +{ + TCGv_i32 vm; + TCGv_ptr fpst; + + if (!vfp_access_check(s)) { + return true; + } + + vm = tcg_temp_new_i32(); + neon_load_reg32(vm, a->vm); + fpst = get_fpstatus_ptr(false); + if (a->s) { + /* i32 -> f32 */ + gen_helper_vfp_sitos(vm, vm, fpst); + } else { + /* u32 -> f32 */ + gen_helper_vfp_uitos(vm, vm, fpst); + } + neon_store_reg32(vm, a->vd); + tcg_temp_free_i32(vm); + tcg_temp_free_ptr(fpst); + return true; +} + +static bool trans_VCVT_int_dp(DisasContext *s, arg_VCVT_int_dp *a) +{ + TCGv_i32 vm; + TCGv_i64 vd; + TCGv_ptr fpst; + + /* UNDEF accesses to D16-D31 if they don't exist. */ + if (!dc_isar_feature(aa32_fp_d32, s) && (a->vd & 0x10)) { + return false; + } + + if (!vfp_access_check(s)) { + return true; + } + + vm = tcg_temp_new_i32(); + vd = tcg_temp_new_i64(); + neon_load_reg32(vm, a->vm); + fpst = get_fpstatus_ptr(false); + if (a->s) { + /* i32 -> f64 */ + gen_helper_vfp_sitod(vd, vm, fpst); + } else { + /* u32 -> f64 */ + gen_helper_vfp_uitod(vd, vm, fpst); + } + neon_store_reg64(vd, a->vd); + tcg_temp_free_i32(vm); + tcg_temp_free_i64(vd); + tcg_temp_free_ptr(fpst); + return true; +} diff --git a/target/arm/translate.c b/target/arm/translate.c index 40e52c3b700..da4d4e9d012 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 ... 15: + case 0 ... 17: /* Already handled by decodetree */ return 1; default: @@ -3063,10 +3063,6 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) if (op == 15) { /* rn is opcode, encoded as per VFP_SREG_N. */ switch (rn) { - case 0x10: /* vcvt.fxx.u32 */ - case 0x11: /* vcvt.fxx.s32 */ - rm_is_dp = false; - break; case 0x18: /* vcvtr.u32.fxx */ case 0x19: /* vcvtz.u32.fxx */ case 0x1a: /* vcvtr.s32.fxx */ @@ -3181,12 +3177,6 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) switch (op) { case 15: /* extension space */ switch (rn) { - case 16: /* fuito */ - gen_vfp_uito(dp, 0); - break; - case 17: /* fsito */ - gen_vfp_sito(dp, 0); - break; case 19: /* vjcvt */ gen_helper_vjcvt(cpu_F0s, cpu_F0d, cpu_env); break; diff --git a/target/arm/vfp.decode b/target/arm/vfp.decode index 56b8b4e6046..6da9a7913da 100644 --- a/target/arm/vfp.decode +++ b/target/arm/vfp.decode @@ -214,3 +214,9 @@ VCVT_sp ---- 1110 1.11 0111 .... 1010 11.0 .... \ vd=%vd_dp vm=%vm_sp VCVT_dp ---- 1110 1.11 0111 .... 1011 11.0 .... \ vd=%vd_sp vm=%vm_dp + +# VCVT from integer to floating point: Vm always single; Vd depends on size +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