From patchwork Thu Jun 13 12:14:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 166627 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp712813ilk; Thu, 13 Jun 2019 05:44:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqxafxiWoKDs0M7YA3SlIE0jMs/exFWbFMlXuB1j7T6xrpu3yOaJ/J8xKCD/+O+VLkj0L7p9 X-Received: by 2002:a0c:aecd:: with SMTP id n13mr3459086qvd.182.1560429880218; Thu, 13 Jun 2019 05:44:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560429880; cv=none; d=google.com; s=arc-20160816; b=B3AgCxT8pHJgPkS/KTqXPITOF8JBnDw076K/7NagOsjc8vinU8hAIf7owslO/s59pb Pk0eLhvH6SoMZdtHJ8gW7oOksW/cEGiDxpMJ7z1Fb1CfSQaLhNswb3l7VdKfpMGkEyqP RZGOmaM2casBZdnomVdCkHoTSwpWvUe76BDl6e5qfODaOeeXUHD+H4LMylQTZl4FCCVZ 4KszxMwLPA4rXOqcsGStb3Taw99+AxyZoQUSYhvBMJb5GkUtBydZIZIb6gwC76a8MVkx Xh6FREkSqlsBlo4jVNFx0EzOFZrpILlMXc1B+Z74ifxkG98I8sgkMZlAqQF+rFL0O4s/ TFQg== 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=4+VW3JoxXuJ1NoxNJ7ljWo6K8LodZM2jZoja5e7yMec=; b=ahMN61iRugulmU/hiffwdIkVk1FZafwVfdiC/RtsjUrmT0n6tjha3LmxBvQFi9ib8E mLVkSIeDxbnQ16AvjsOgZkiLlWAQEwNkoM/n4E2aeHa3BHa88tUIDxXnFtX6HBq38N+q 8s1UHExIqMb3E6so7RDSvZn+6gB+dYuGpuxcjKNKQHC9rjGoSxSmRY7zydFxop62/g1H FSIcIsoDCqtozZc/dd1jH9aGfEpCsQ3jvFyS3EZnYdZubNw76ttrpKA/lbqavtujNXLA RQJUBbU+GA58Ep18EUcFYCqv3vomw6zdurh2igJpvml/iSoruWA8mHyzrpr7ffI468fo 7VPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YJkouCQa; 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 l9si1446996qvc.198.2019.06.13.05.44.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Jun 2019 05:44:40 -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=YJkouCQa; 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]:39474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbP5r-00024A-Eb for patch@linaro.org; Thu, 13 Jun 2019 08:44:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58961) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbOdH-0007xu-Gl for qemu-devel@nongnu.org; Thu, 13 Jun 2019 08:15:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbOdE-0004HY-T6 for qemu-devel@nongnu.org; Thu, 13 Jun 2019 08:15:07 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:34055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hbOdA-0004Ai-4D for qemu-devel@nongnu.org; Thu, 13 Jun 2019 08:15:02 -0400 Received: by mail-wm1-x32b.google.com with SMTP id w9so6495644wmd.1 for ; Thu, 13 Jun 2019 05:14:59 -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=4+VW3JoxXuJ1NoxNJ7ljWo6K8LodZM2jZoja5e7yMec=; b=YJkouCQaIiZbZia6XQdveXD5o/cvCdlZKocXJQW4D6vfBwYf8rS3hMlgrzKyS9PfPo Ksc5cN1wKGpBpP8bBMnMgagUrdBVUfsANwkNKE1KOH5y2wIUd8+wRiUey/Hl0ku91EDR WhboPCAs9ABWfR7IYr3vx+KrUCYoiUh87Xr8jXhld0BrcbZbenxt+Q3NjGlJ9wrW7RhJ 39TQhS1R9CmNfkZPvqFjGDXDaAbHjyBKuFZ5fZGVHvpQyU0MbNDEiz/FyV8WFzC7A8R3 HYlchRFxe3LJ9l3wHgp4Johcrqv51xs/vi5kifiVdR1AagKF1CeBlA+Wxmu4d/2OrFdf SRIQ== 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=4+VW3JoxXuJ1NoxNJ7ljWo6K8LodZM2jZoja5e7yMec=; b=m8gSbn682ituhcYCQVzKEOzQSm+5spYeBFxM08ayI+LwtHwrNHUxhJ8H5lSMDply5H pq/N5FBzWXs1ecPa49N3oK71K9c4EjsbYY8lMJ+uazkjhM5TjKzVyQ5gtiIJ2RX0d4on K0Jh+6Pn7/wVf0+pK9h/7gsAXPWj6ORj8DotN7WI0q5yjPLq4R4JgXbSA5pZc27NLy7S Vb/ePh1iOzKGVB/meHgiNCnGhz6ft7gi6c54MFOR/0XC1WFlci0i1RCnpbLNPNWI2x0Z pOu1PwANvH04q8vUYthFAuqInra5EU4FiujHHoyY0G4V/Zp+GWCIV7Z9htlBagfWFvpA mZOQ== X-Gm-Message-State: APjAAAWDDfptyEnaQ9Oy3TyNkdxZI9AwznCg07lkeg8nyuXxhCEDftM5 af/YecrdPS/O8r1/brIZPMJhI8RE+qaR2w== X-Received: by 2002:a1c:4484:: with SMTP id r126mr3672362wma.27.1560428097741; Thu, 13 Jun 2019 05:14:57 -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.14.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jun 2019 05:14:56 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 13 Jun 2019 13:14:05 +0100 Message-Id: <20190613121433.5246-21-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::32b Subject: [Qemu-devel] [PULL 20/48] target/arm: Convert VFP two-register transfer 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 VFP two-register transfer instructions to decodetree (in the v8 Arm ARM these are the "Advanced SIMD and floating-point 64-bit move" encoding group). Again, we expand out the sequences involving gen_vfp_msr() and gen_msr_vfp(). Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/translate-vfp.inc.c | 70 ++++++++++++++++++++++++++++++++++ target/arm/translate.c | 46 +--------------------- target/arm/vfp.decode | 5 +++ 3 files changed, 77 insertions(+), 44 deletions(-) -- 2.20.1 diff --git a/target/arm/translate-vfp.inc.c b/target/arm/translate-vfp.inc.c index 74c10f9024b..5f081221b83 100644 --- a/target/arm/translate-vfp.inc.c +++ b/target/arm/translate-vfp.inc.c @@ -783,3 +783,73 @@ static bool trans_VMOV_single(DisasContext *s, arg_VMOV_single *a) return true; } + +static bool trans_VMOV_64_sp(DisasContext *s, arg_VMOV_64_sp *a) +{ + TCGv_i32 tmp; + + /* + * VMOV between two general-purpose registers and two single precision + * floating point registers + */ + if (!vfp_access_check(s)) { + return true; + } + + if (a->op) { + /* fpreg to gpreg */ + tmp = tcg_temp_new_i32(); + neon_load_reg32(tmp, a->vm); + store_reg(s, a->rt, tmp); + tmp = tcg_temp_new_i32(); + neon_load_reg32(tmp, a->vm + 1); + store_reg(s, a->rt2, tmp); + } else { + /* gpreg to fpreg */ + tmp = load_reg(s, a->rt); + neon_store_reg32(tmp, a->vm); + tmp = load_reg(s, a->rt2); + neon_store_reg32(tmp, a->vm + 1); + } + + return true; +} + +static bool trans_VMOV_64_dp(DisasContext *s, arg_VMOV_64_sp *a) +{ + TCGv_i32 tmp; + + /* + * VMOV between two general-purpose registers and one double precision + * floating point register + */ + + /* 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; + } + + if (a->op) { + /* fpreg to gpreg */ + tmp = tcg_temp_new_i32(); + neon_load_reg32(tmp, a->vm * 2); + store_reg(s, a->rt, tmp); + tmp = tcg_temp_new_i32(); + neon_load_reg32(tmp, a->vm * 2 + 1); + store_reg(s, a->rt2, tmp); + } else { + /* gpreg to fpreg */ + tmp = load_reg(s, a->rt); + neon_store_reg32(tmp, a->vm * 2); + tcg_temp_free_i32(tmp); + tmp = load_reg(s, a->rt2); + neon_store_reg32(tmp, a->vm * 2 + 1); + tcg_temp_free_i32(tmp); + } + + return true; +} diff --git a/target/arm/translate.c b/target/arm/translate.c index 3982c870314..eb217af579a 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -3703,50 +3703,8 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) case 0xc: case 0xd: if ((insn & 0x03e00000) == 0x00400000) { - /* two-register transfer */ - rn = (insn >> 16) & 0xf; - rd = (insn >> 12) & 0xf; - if (dp) { - VFP_DREG_M(rm, insn); - } else { - rm = VFP_SREG_M(insn); - } - - if (insn & ARM_CP_RW_BIT) { - /* vfp->arm */ - if (dp) { - gen_mov_F0_vreg(0, rm * 2); - tmp = gen_vfp_mrs(); - store_reg(s, rd, tmp); - gen_mov_F0_vreg(0, rm * 2 + 1); - tmp = gen_vfp_mrs(); - store_reg(s, rn, tmp); - } else { - gen_mov_F0_vreg(0, rm); - tmp = gen_vfp_mrs(); - store_reg(s, rd, tmp); - gen_mov_F0_vreg(0, rm + 1); - tmp = gen_vfp_mrs(); - store_reg(s, rn, tmp); - } - } else { - /* arm->vfp */ - if (dp) { - tmp = load_reg(s, rd); - gen_vfp_msr(tmp); - gen_mov_vreg_F0(0, rm * 2); - tmp = load_reg(s, rn); - gen_vfp_msr(tmp); - gen_mov_vreg_F0(0, rm * 2 + 1); - } else { - tmp = load_reg(s, rd); - gen_vfp_msr(tmp); - gen_mov_vreg_F0(0, rm); - tmp = load_reg(s, rn); - gen_vfp_msr(tmp); - gen_mov_vreg_F0(0, rm + 1); - } - } + /* Already handled by decodetree */ + return 1; } else { /* Load/store */ rn = (insn >> 16) & 0xf; diff --git a/target/arm/vfp.decode b/target/arm/vfp.decode index bb7de403df3..134f1c9ef58 100644 --- a/target/arm/vfp.decode +++ b/target/arm/vfp.decode @@ -66,3 +66,8 @@ VDUP ---- 1110 1 b:1 q:1 0 .... rt:4 1011 . 0 e:1 1 0000 \ VMSR_VMRS ---- 1110 111 l:1 reg:4 rt:4 1010 0001 0000 VMOV_single ---- 1110 000 l:1 .... rt:4 1010 . 001 0000 \ vn=%vn_sp + +VMOV_64_sp ---- 1100 010 op:1 rt2:4 rt:4 1010 00.1 .... \ + vm=%vm_sp +VMOV_64_dp ---- 1100 010 op:1 rt2:4 rt:4 1011 00.1 .... \ + vm=%vm_dp