From patchwork Tue May 28 14:07:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 799492 Delivered-To: patch@linaro.org Received: by 2002:adf:e110:0:b0:35b:5a80:51b4 with SMTP id t16csp257820wrz; Tue, 28 May 2024 07:13:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVw1gXt5puEKZuPZVn9hP0vb6PVx+HM5wnC47Q/hC2VZT/thcnfD+ShyNvuQLtKHaUbnRT8nR7VzKnTMVnAINQE X-Google-Smtp-Source: AGHT+IGCOQJx6ST5DMVhwM3WXn4jwJXZnzv/SboDBVnZMaEkCGvg4Y82FA/GiJTKob+fBFPHS/n4 X-Received: by 2002:a05:6870:d608:b0:24f:cddc:ccfe with SMTP id 586e51a60fabf-24fcddcdee4mr9317575fac.0.1716905626628; Tue, 28 May 2024 07:13:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716905626; cv=none; d=google.com; s=arc-20160816; b=B7ddl0AYOmojSLqJec5SgN0BUxQ7Ou3iXxCZZYiMDapw0vKqajdhgT/qWklxwz1sfl QCKnjErwzQoRBHfy6KbSAyKyVmUr7NWk0UZ0bWcvJx1iPueERu+EvKhaXPbF0qyXerxy tfhgbxUgjCzS2xvf9DitPUk3K1EszIm9Nd5Ma7jceedHGtRK4RF9Qr/CU94oImkDxPS1 itVBod5JyH5jqptKYEfKyJ9d8+oW301hCLckw0JTn4NZlxg73pUQUlxpGeIQMetDNrS/ jN71XRJkvzhANb1HwHmLgNaHgkhj2MkgxVHfdkDxrqsh6efunFgAD1xWvjfjaUxp9S/P 1YWA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=7BpILccreJv3wPcv9huqs/UAol5xV2assISwJtuW028=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=CQ9A4MqyzXDOiZx6lQlRZ8dTT+2yeMbgsz2zheZDkGX6GUVc+sNFnrnrvltci602si gMfKXFjM+8NPMeIU/3R6XM4HAaLSkLrRcN8YH5YFCyVFVwBMhvUxoyreC3i1IOntFbyj fhBOVR3eR8YOCJ+SHEtZD4AdUwWZX75KD4ZTL5D+EMGjhohEk2lJcOSS9/J77Qfh/VRG S2xeTj+dNVK5AEFvYzSslPrviCtyhL7Ly82MngTNd+esrIiyywB0n1d9JP3WtZAshBLo Sd6iv8O/LGElUWWZwnkQhPkgpGXE9UTsK0+WApCG6RNoYfs86PiwF4tJ94OYTyN0h8Ga s4iw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IBIsfOCa; 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=pass (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 ada2fe7eead31-48a3a206a54si2101698137.145.2024.05.28.07.13.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 May 2024 07:13:46 -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=pass header.i=@linaro.org header.s=google header.b=IBIsfOCa; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sBxUt-0001ds-Bq; Tue, 28 May 2024 10:08:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sBxUs-0001cf-8m for qemu-devel@nongnu.org; Tue, 28 May 2024 10:08:14 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sBxUo-00074a-3z for qemu-devel@nongnu.org; Tue, 28 May 2024 10:08:13 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-421087b6f3fso6866285e9.1 for ; Tue, 28 May 2024 07:08:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716905288; x=1717510088; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7BpILccreJv3wPcv9huqs/UAol5xV2assISwJtuW028=; b=IBIsfOCaxabwhP53mrIqLIwBTcuasN31Aq7McSggh45QFBeVjPgGRV16JUbW849MH3 AyKPegqjOjPJTOF6QdTbE6T6JSAzavSqZTsCK5/sEfDDcCXC/JEe7oM1968nq8nEX+od Q5bPXwIZW4ps6TuxIXKrpdjiuEyZycCgNvFtuAXzMaZTeDzYOmXYs7Mizo4HoWczLBZ/ 5ds0Q1BgKxEdSvL5FER8WVhYu7ZsFkZeNrtQUCYDme5HE3YtYhs/9iPXK/pTlDhQiDw2 crEGA7DMccsX0COtapLdnVBfkeoXVnse0EdKv/M3sVgfpWmFluQkMhaWBS8Q3q8xVtUQ Ta4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716905288; x=1717510088; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7BpILccreJv3wPcv9huqs/UAol5xV2assISwJtuW028=; b=UwkPYrguDtt4Un0OOeJ2pXlWuRpM/RlqkhdMHd8jY1zBRtvkwRP+erHDpGTeDZvmOU DGNRL+9K7zrK2BaBQ3z+DHaSA5QRFsiKKQdS81tCQXM3zejEFO0YuhzQvUCmL/knG18b 4QrXMUYlZ/hw6sO1PrFZ0KGIgvvYngGck/NJ5/Oe+7t7YPDiR1fz0+fl0boOMEJsj1xj laqim75RiG8vC3RJKE6/ylCHtkfV0qS5HDxKxG1z2/w0uFF41OAVbDo1asWazJGO+6Ik OpSru3v96p6kkTDk5qn2ji1NTebJ3Ga7kD4MbRJPbf69QyPT0c+K9jFsAtJ0stt8wwVe vTkg== X-Gm-Message-State: AOJu0YwCHB/ZXfQPN97JrfNsOQF+85y5o1kHNbZ5tr8ps+13YWO+bRf1 gQTwkotSFQIot3OXXljjAiUkinsIwc+7/7MurDgUBHZ78pHoIYFnWFTrHnYD9rk3XnMQ6iHhinE Y X-Received: by 2002:adf:fcce:0:b0:34b:81b3:2c62 with SMTP id ffacd0b85a97d-3552219d1e6mr8183411f8f.35.1716905288645; Tue, 28 May 2024 07:08:08 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3564afc3577sm11361473f8f.102.2024.05.28.07.08.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 May 2024 07:08:08 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 22/42] target/arm: Convert XAR to decodetree Date: Tue, 28 May 2024 15:07:33 +0100 Message-Id: <20240528140753.3620597-23-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240528140753.3620597-1-peter.maydell@linaro.org> References: <20240528140753.3620597-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20240524232121.284515-17-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/a64.decode | 4 ++++ target/arm/tcg/translate-a64.c | 43 +++++++++++----------------------- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/target/arm/tcg/a64.decode b/target/arm/tcg/a64.decode index 1292312a7f9..7f354af25d3 100644 --- a/target/arm/tcg/a64.decode +++ b/target/arm/tcg/a64.decode @@ -654,3 +654,7 @@ SM3TT1A 11001110 010 ..... 10 .. 00 ..... ..... @crypto3i SM3TT1B 11001110 010 ..... 10 .. 01 ..... ..... @crypto3i SM3TT2A 11001110 010 ..... 10 .. 10 ..... ..... @crypto3i SM3TT2B 11001110 010 ..... 10 .. 11 ..... ..... @crypto3i + +### Cryptographic XAR + +XAR 1100 1110 100 rm:5 imm:6 rn:5 rd:5 diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index cf3a7dfa99f..75f1e6a7b90 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -4688,6 +4688,20 @@ TRANS_FEAT(SM3TT1B, aa64_sm3, do_crypto3i, a, gen_helper_crypto_sm3tt1b) TRANS_FEAT(SM3TT2A, aa64_sm3, do_crypto3i, a, gen_helper_crypto_sm3tt2a) TRANS_FEAT(SM3TT2B, aa64_sm3, do_crypto3i, a, gen_helper_crypto_sm3tt2b) +static bool trans_XAR(DisasContext *s, arg_XAR *a) +{ + if (!dc_isar_feature(aa64_sha3, s)) { + return false; + } + if (fp_access_check(s)) { + gen_gvec_xar(MO_64, vec_full_reg_offset(s, a->rd), + vec_full_reg_offset(s, a->rn), + vec_full_reg_offset(s, a->rm), a->imm, 16, + vec_full_reg_size(s)); + } + return true; +} + /* Shift a TCGv src by TCGv shift_amount, put result in dst. * Note that it is the caller's responsibility to ensure that the * shift amount is in range (ie 0..31 or 0..63) and provide the ARM @@ -13588,34 +13602,6 @@ static void disas_simd_indexed(DisasContext *s, uint32_t insn) } } -/* Crypto XAR - * 31 21 20 16 15 10 9 5 4 0 - * +-----------------------+------+--------+------+------+ - * | 1 1 0 0 1 1 1 0 1 0 0 | Rm | imm6 | Rn | Rd | - * +-----------------------+------+--------+------+------+ - */ -static void disas_crypto_xar(DisasContext *s, uint32_t insn) -{ - int rm = extract32(insn, 16, 5); - int imm6 = extract32(insn, 10, 6); - int rn = extract32(insn, 5, 5); - int rd = extract32(insn, 0, 5); - - if (!dc_isar_feature(aa64_sha3, s)) { - unallocated_encoding(s); - return; - } - - if (!fp_access_check(s)) { - return; - } - - gen_gvec_xar(MO_64, vec_full_reg_offset(s, rd), - vec_full_reg_offset(s, rn), - vec_full_reg_offset(s, rm), imm6, 16, - vec_full_reg_size(s)); -} - /* C3.6 Data processing - SIMD, inc Crypto * * As the decode gets a little complex we are using a table based @@ -13644,7 +13630,6 @@ static const AArch64DecodeTable data_proc_simd[] = { { 0x5e000400, 0xdfe08400, disas_simd_scalar_copy }, { 0x5f000000, 0xdf000400, disas_simd_indexed }, /* scalar indexed */ { 0x5f000400, 0xdf800400, disas_simd_scalar_shift_imm }, - { 0xce800000, 0xffe00000, disas_crypto_xar }, { 0x0e400400, 0x9f60c400, disas_simd_three_reg_same_fp16 }, { 0x0e780800, 0x8f7e0c00, disas_simd_two_reg_misc_fp16 }, { 0x5e400400, 0xdf60c400, disas_simd_scalar_three_reg_same_fp16 },