From patchwork Wed Feb 28 19:31:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 130057 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp133264lja; Wed, 28 Feb 2018 11:38:14 -0800 (PST) X-Google-Smtp-Source: AG47ELv85i6xYV09r+cr0tXTHnAoOxbLr4dukfeW+cy7WvWG08Op+TmD5Nks8jRlN5afMpb4FL6O X-Received: by 10.129.129.6 with SMTP id r6mr12983224ywf.195.1519846694495; Wed, 28 Feb 2018 11:38:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519846694; cv=none; d=google.com; s=arc-20160816; b=Si3w+rbs2tkNdn/8JjjPsJqYmSmw+MvlmisvZKALoruYT0bTy6tbdh7ryTR0vvfod3 GPOOQF0hsfb/0SBY4RyV8NG7okX4sqAXMwsa594yzC+dduVwlD84hY9fyeOLJHh2bKHW FlZsDERRzqIj6K1LG0xc6/l5mwXBZwopZsxfZd/1r0bCxnQ7DCctPHechO/PFC+p5sbH i+jnlrjnAw2+x+N2up5B2UBADDtYNdXb82g7ho5PQMrkE1pMc5UdRW9jTbwDHCzLRfpS X8Il1mNxmxE4V9hm0Qn4h+rePiqhcuXre+10v6av1rTR6ZdV3oGRgpVvPeIA3SOJ2IQt uhIw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=uMvs/o2ddqXyYFNZ707Chol3lmqK9fZj+/t+Dj/gMrw=; b=odsqwR886PFpnbdjxxPzukRqS4bjUYUeVZ70TJcT+C2IkqJzDmPMaxUIOzxh22Ym87 KkzGLZPJNQN8II09T/0O/kCfU3d4UKkOzTxo8J38Ki8wI7pChNFyD2KjFdNbghGSPRP6 FspOi+xwdzZAI9+S0dgAVHNLiaHxGG4zoXLUgnr9hAnv6amLIcbY0FKZqkuVLtO+G8dB CAiN6aDkQNSTcJKwrfvo3mfzKRGcrLGQEx6GikGB0J1W6NnjCT/IL684MJX8nFfR40wr WiO09vaUj7WgbkTfaK7LfPiN8xv7tgQmuW72ZL7w/zhdO+us2+gbYmYzJ7SLFWHNj2Wq wmzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=H5GQDLRG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p62si381187ywp.128.2018.02.28.11.38.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 28 Feb 2018 11:38:14 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=H5GQDLRG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:46445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er7YL-0000DK-Pz for patch@linaro.org; Wed, 28 Feb 2018 14:38:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er7Rt-0003FK-MU for qemu-devel@nongnu.org; Wed, 28 Feb 2018 14:31:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1er7Rs-0006FM-1k for qemu-devel@nongnu.org; Wed, 28 Feb 2018 14:31:33 -0500 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:36214) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1er7Rr-0006Eq-QL for qemu-devel@nongnu.org; Wed, 28 Feb 2018 14:31:31 -0500 Received: by mail-pl0-x243.google.com with SMTP id 61-v6so2126122plf.3 for ; Wed, 28 Feb 2018 11:31:31 -0800 (PST) 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; bh=uMvs/o2ddqXyYFNZ707Chol3lmqK9fZj+/t+Dj/gMrw=; b=H5GQDLRGJSS4a0B60awV9ZA3vIY2Bp0FnFxq9opbh1Mvrza+Qq/u5ppIOz9rQtTcjd /RObauC2eXSyHW9XRsqGblLHuqScTyDgKl8yPPZxaI8pmqpKK1W0ahj0+i7YGA1WTWn4 ANGVRlUaPscEmSPAsEEUPDFddhMAPLyfuAfYw= 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; bh=uMvs/o2ddqXyYFNZ707Chol3lmqK9fZj+/t+Dj/gMrw=; b=cKbEzsEyIriqGjrF5ZZaWfls6n3hlVzNYCePATk6bXxUT4oYtezNMR3IL2nR5IhIn4 8Gu+Q7z3gN2p0Yb751aZZ5SGxBKaurv1ib8oSddKYHeiGG6K9Wnkgun3XjFKJRyjw7aW l8NohgwX5g4ZK6J5jmnrNuCP7Y9UHCYvO+X1jJoQBWb4Ep98YM8rIxGhejHJ+uZs9CWb kUgZNkmjd2qc3TF+EhiScCG2WoTijVqoGzU6loeUbReusd2TNHImvWmnTB/h9/61URz4 i3wDZg6lkDWifwFOtFOaMVsZn/IG0CE0XnmwyiDn3ke+Y3xNCxa3RGQ3NokbePi7JXVU pwKw== X-Gm-Message-State: APf1xPCifkII6yF4x4Gf+0aogmfcLK1n2eRDU3FJl2k8Qqqhr7lbNl8k 0TNi7gfa+OJIltycUyXyPxXyMJeMU8s= X-Received: by 2002:a17:902:2e04:: with SMTP id q4-v6mr18903971plb.22.1519846290427; Wed, 28 Feb 2018 11:31:30 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-169-147.tukw.qwest.net. [97.113.169.147]) by smtp.gmail.com with ESMTPSA id k185sm4200212pgk.94.2018.02.28.11.31.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Feb 2018 11:31:29 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Feb 2018 11:31:11 -0800 Message-Id: <20180228193125.20577-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180228193125.20577-1-richard.henderson@linaro.org> References: <20180228193125.20577-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::243 Subject: [Qemu-devel] [PATCH v3 02/16] target/arm: Refactor disas_simd_indexed decode 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: qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Include the U bit in the switches rather than testing separately. Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 129 +++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 68 deletions(-) -- 2.14.3 Reviewed-by: Peter Maydell diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 32811dc8b0..fc928b61f6 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -11787,49 +11787,39 @@ static void disas_simd_indexed(DisasContext *s, uint32_t insn) int index; TCGv_ptr fpst; - switch (opcode) { - case 0x0: /* MLA */ - case 0x4: /* MLS */ - if (!u || is_scalar) { + switch (16 * u + opcode) { + case 0x08: /* MUL */ + case 0x10: /* MLA */ + case 0x14: /* MLS */ + if (is_scalar) { unallocated_encoding(s); return; } break; - case 0x2: /* SMLAL, SMLAL2, UMLAL, UMLAL2 */ - case 0x6: /* SMLSL, SMLSL2, UMLSL, UMLSL2 */ - case 0xa: /* SMULL, SMULL2, UMULL, UMULL2 */ + case 0x02: /* SMLAL, SMLAL2 */ + case 0x12: /* UMLAL, UMLAL2 */ + case 0x06: /* SMLSL, SMLSL2 */ + case 0x16: /* UMLSL, UMLSL2 */ + case 0x0a: /* SMULL, SMULL2 */ + case 0x1a: /* UMULL, UMULL2 */ if (is_scalar) { unallocated_encoding(s); return; } is_long = true; break; - case 0x3: /* SQDMLAL, SQDMLAL2 */ - case 0x7: /* SQDMLSL, SQDMLSL2 */ - case 0xb: /* SQDMULL, SQDMULL2 */ + case 0x03: /* SQDMLAL, SQDMLAL2 */ + case 0x07: /* SQDMLSL, SQDMLSL2 */ + case 0x0b: /* SQDMULL, SQDMULL2 */ is_long = true; - /* fall through */ - case 0xc: /* SQDMULH */ - case 0xd: /* SQRDMULH */ - if (u) { - unallocated_encoding(s); - return; - } break; - case 0x8: /* MUL */ - if (u || is_scalar) { - unallocated_encoding(s); - return; - } + case 0x0c: /* SQDMULH */ + case 0x0d: /* SQRDMULH */ break; - case 0x1: /* FMLA */ - case 0x5: /* FMLS */ - if (u) { - unallocated_encoding(s); - return; - } - /* fall through */ - case 0x9: /* FMUL, FMULX */ + case 0x01: /* FMLA */ + case 0x05: /* FMLS */ + case 0x09: /* FMUL */ + case 0x19: /* FMULX */ if (size == 1) { unallocated_encoding(s); return; @@ -11909,21 +11899,20 @@ static void disas_simd_indexed(DisasContext *s, uint32_t insn) read_vec_element(s, tcg_op, rn, pass, MO_64); - switch (opcode) { - case 0x5: /* FMLS */ + switch (16 * u + opcode) { + case 0x05: /* FMLS */ /* As usual for ARM, separate negation for fused multiply-add */ gen_helper_vfp_negd(tcg_op, tcg_op); /* fall through */ - case 0x1: /* FMLA */ + case 0x01: /* FMLA */ read_vec_element(s, tcg_res, rd, pass, MO_64); gen_helper_vfp_muladdd(tcg_res, tcg_op, tcg_idx, tcg_res, fpst); break; - case 0x9: /* FMUL, FMULX */ - if (u) { - gen_helper_vfp_mulxd(tcg_res, tcg_op, tcg_idx, fpst); - } else { - gen_helper_vfp_muld(tcg_res, tcg_op, tcg_idx, fpst); - } + case 0x09: /* FMUL */ + gen_helper_vfp_muld(tcg_res, tcg_op, tcg_idx, fpst); + break; + case 0x19: /* FMULX */ + gen_helper_vfp_mulxd(tcg_res, tcg_op, tcg_idx, fpst); break; default: g_assert_not_reached(); @@ -11966,10 +11955,10 @@ static void disas_simd_indexed(DisasContext *s, uint32_t insn) read_vec_element_i32(s, tcg_op, rn, pass, is_scalar ? size : MO_32); - switch (opcode) { - case 0x0: /* MLA */ - case 0x4: /* MLS */ - case 0x8: /* MUL */ + switch (16 * u + opcode) { + case 0x08: /* MUL */ + case 0x10: /* MLA */ + case 0x14: /* MLS */ { static NeonGenTwoOpFn * const fns[2][2] = { { gen_helper_neon_add_u16, gen_helper_neon_sub_u16 }, @@ -11991,8 +11980,8 @@ static void disas_simd_indexed(DisasContext *s, uint32_t insn) genfn(tcg_res, tcg_op, tcg_res); break; } - case 0x5: /* FMLS */ - case 0x1: /* FMLA */ + case 0x05: /* FMLS */ + case 0x01: /* FMLA */ read_vec_element_i32(s, tcg_res, rd, pass, is_scalar ? size : MO_32); switch (size) { @@ -12023,39 +12012,43 @@ static void disas_simd_indexed(DisasContext *s, uint32_t insn) g_assert_not_reached(); } break; - case 0x9: /* FMUL, FMULX */ + case 0x09: /* FMUL */ switch (size) { case 1: - if (u) { - if (is_scalar) { - gen_helper_advsimd_mulxh(tcg_res, tcg_op, - tcg_idx, fpst); - } else { - gen_helper_advsimd_mulx2h(tcg_res, tcg_op, - tcg_idx, fpst); - } + if (is_scalar) { + gen_helper_advsimd_mulh(tcg_res, tcg_op, + tcg_idx, fpst); } else { - if (is_scalar) { - gen_helper_advsimd_mulh(tcg_res, tcg_op, - tcg_idx, fpst); - } else { - gen_helper_advsimd_mul2h(tcg_res, tcg_op, - tcg_idx, fpst); - } + gen_helper_advsimd_mul2h(tcg_res, tcg_op, + tcg_idx, fpst); } break; case 2: - if (u) { - gen_helper_vfp_mulxs(tcg_res, tcg_op, tcg_idx, fpst); - } else { - gen_helper_vfp_muls(tcg_res, tcg_op, tcg_idx, fpst); - } + gen_helper_vfp_muls(tcg_res, tcg_op, tcg_idx, fpst); break; default: g_assert_not_reached(); } break; - case 0xc: /* SQDMULH */ + case 0x19: /* FMULX */ + switch (size) { + case 1: + if (is_scalar) { + gen_helper_advsimd_mulxh(tcg_res, tcg_op, + tcg_idx, fpst); + } else { + gen_helper_advsimd_mulx2h(tcg_res, tcg_op, + tcg_idx, fpst); + } + break; + case 2: + gen_helper_vfp_mulxs(tcg_res, tcg_op, tcg_idx, fpst); + break; + default: + g_assert_not_reached(); + } + break; + case 0x0c: /* SQDMULH */ if (size == 1) { gen_helper_neon_qdmulh_s16(tcg_res, cpu_env, tcg_op, tcg_idx); @@ -12064,7 +12057,7 @@ static void disas_simd_indexed(DisasContext *s, uint32_t insn) tcg_op, tcg_idx); } break; - case 0xd: /* SQRDMULH */ + case 0x0d: /* SQRDMULH */ if (size == 1) { gen_helper_neon_qrdmulh_s16(tcg_res, cpu_env, tcg_op, tcg_idx);