From patchwork Mon May 30 16:05:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 577203 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:330b:0:0:0:0 with SMTP id f11csp386818mag; Mon, 30 May 2022 09:24:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxdnOVi2/4JI4601TrlGInLN4qShaBIJdbEokg+cMsOMqu2s6p7DyGPMS+PvGXg90Gvw1i X-Received: by 2002:a05:622a:1654:b0:2f3:deaa:4d53 with SMTP id y20-20020a05622a165400b002f3deaa4d53mr44331863qtj.232.1653927898624; Mon, 30 May 2022 09:24:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653927898; cv=none; d=google.com; s=arc-20160816; b=dKO+aYk4GglPA1UiW3IlDNiE9MKu/xY9Jm5j1vOK5bPL51gcMsVh0WK1GzCUsGyElW AlsELy3O//Wis71BTA3TXxvGlcOaCerxvIPH84FAacB1Zr0Fvp96s77B2Qk2IkgyLxMQ fANPMSQCL098qOwv1BmCiE7od090h9MK7DMTwYFuneEGOfhA1NEl82QI9TPusATDIm4Z LLwOhoFG0/ISY1JzquHqSDT8mggPXLdWYfYHyCSO+NlFhNpQUIvta9yuZ+Oh9Q8sYc/1 xODsMLOgbI1uE7NJTLuHjeq2bYFSatFWSMR0cGLDnhKZB5jYB9t0uvSsh0HFiSC7xdip A9GQ== 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=7AqONkXRndtLTY/Cz7hw6z5A8ywsRInfoZHs3HnpjSk=; b=LsPtRdnkuV092/deJ8I06qZ4x6sCsuSLI/2W3juimCYSr+aKQUSqEQF9sDD1v58GBa ACV1Gs77MODqovwoCU3Q0hL0CQZzxMKLeWGmg5PiSGR/Q87VEQjgnYBg8WFGXqTELcYQ OUpEcSJW1OWIzgDE2RLZdMZXIEI4AcbsnToRuKqvxfuftU/W7rZTM1naxH/a6d7tswd1 QYccOtKsAJQDPY3B5m9Wz2X5YlteHLK8c9k5B5N06h+ad/YGf3fV0mgK7HU88DqaKx9a MpLL045f/Tl6TqjTGjvRgSNpjC2fx25dNXBgowKwjuVHbo+XQSt0Bu7R9Jk99NmUM0/H BF6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RnL12axA; 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 b17-20020ac87fd1000000b002f3bdc93211si7989297qtk.17.2022.05.30.09.24.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 May 2022 09:24:58 -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=RnL12axA; 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]:44614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nviCQ-00007t-7H for patch@linaro.org; Mon, 30 May 2022 12:24:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvhvS-0002qc-FE for qemu-devel@nongnu.org; Mon, 30 May 2022 12:07:26 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:51161) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nvhvQ-0007Dx-P4 for qemu-devel@nongnu.org; Mon, 30 May 2022 12:07:26 -0400 Received: by mail-wm1-x329.google.com with SMTP id o9so6671204wmd.0 for ; Mon, 30 May 2022 09:07: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=7AqONkXRndtLTY/Cz7hw6z5A8ywsRInfoZHs3HnpjSk=; b=RnL12axAgdgeF8rg3cKmJc3PtqtB6EzbNEkpnK9a6yD8mDDG+kvGgM52SF6mGU7xem ZjS/kfvuLgwLm6zOn1dvNHYmI2CbYVySXg7m6K3hXWDRmYNduQUS1Xi0rvbWuF9Ntw6N ljq++eJZf6Erstq6wCST+bj1G77bz9hvrsi32GU447nhTvYeqo8elhlcIgouvRKIUE83 SqZF8poSWiJw6GknrwqQCgmkmWPXkHeDv9KGY9tryLhBNmAPhWR8yL60fTab/qyXP/x9 nOzEGd7uKL+Ur8TnghqnV+P26oraZ3NLTqAATQRYfC21ClcejorO+Tay2OgtLUVaYWRj VK6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7AqONkXRndtLTY/Cz7hw6z5A8ywsRInfoZHs3HnpjSk=; b=T6M2mU+M23ZUVa9n3sQ1pMQWPmB+FUHZRH8bbHhC7t3kkPqkKadlaIrE0P5/wAfTDf rgQ5bPrctn8Ds7f1YGmrRgKFKnZYXz26z1jlCsPpUp4JuWg74XVQeFY6AAErcxCXdPN8 0E9DDZcIQ+1KgFRNN28Jf062C5IzApuJLb5bQOB09eMR3IbyFIYNpNpOyWo0LpUPBePA 2tUaYzG37y3vjm0SNG1mj+NoPYoa2k67hH+LGCfm9AKMDF8MpYMv3pi4rvkJ+Z+6Ns5L 19xKOp/86mRl3u8pH+E1xATUXplXBE6Aq6XySmUz5z7f/NKcIo39QqJr+6fNAvda1OLR M8vA== X-Gm-Message-State: AOAM533i99CiskaVYdAlUsKCoto0v2aFmvL9q06x2dzjKI88wIn8oWQp s1snJaQP0om2CUS8gGAZKtNN0699y5DkHA== X-Received: by 2002:a05:600c:4fd2:b0:39b:893e:ff79 with SMTP id o18-20020a05600c4fd200b0039b893eff79mr7178734wmq.73.1653926843287; Mon, 30 May 2022 09:07:23 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id bi12-20020a05600c3d8c00b003974b95d897sm10232152wmb.37.2022.05.30.09.07.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 09:07:22 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 016/117] target/arm: Rename do_zzxz_ool to gen_gvec_ool_arg_zzxz Date: Mon, 30 May 2022 17:05:27 +0100 Message-Id: <20220530160708.726466-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220530160708.726466-1-peter.maydell@linaro.org> References: <20220530160708.726466-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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" From: Richard Henderson Rename the function to match gen_gvec_ool_arg_zzzz, and move to be adjacent. Signed-off-by: Richard Henderson Message-id: 20220527181907.189259-14-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/translate-sve.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index f7367a4f62c..b42df76c697 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -199,6 +199,12 @@ static bool gen_gvec_ool_arg_zzzz(DisasContext *s, gen_helper_gvec_4 *fn, return gen_gvec_ool_zzzz(s, fn, a->rd, a->rn, a->rm, a->ra, data); } +static bool gen_gvec_ool_arg_zzxz(DisasContext *s, gen_helper_gvec_4 *fn, + arg_rrxr_esz *a) +{ + return gen_gvec_ool_zzzz(s, fn, a->rd, a->rn, a->rm, a->ra, a->index); +} + /* Invoke an out-of-line helper on 2 Zregs and a predicate. */ static void gen_gvec_ool_zzp(DisasContext *s, gen_helper_gvec_3 *fn, int rd, int rn, int pg, int data) @@ -3820,15 +3826,9 @@ TRANS_FEAT(DOT_zzzz, aa64_sve, gen_gvec_ool_zzzz, * SVE Multiply - Indexed */ -static bool do_zzxz_ool(DisasContext *s, arg_rrxr_esz *a, - gen_helper_gvec_4 *fn) -{ - return gen_gvec_ool_zzzz(s, fn, a->rd, a->rn, a->rm, a->ra, a->index); -} - #define DO_RRXR(NAME, FUNC) \ static bool NAME(DisasContext *s, arg_rrxr_esz *a) \ - { return do_zzxz_ool(s, a, FUNC); } + { return gen_gvec_ool_arg_zzxz(s, FUNC, a); } DO_RRXR(trans_SDOT_zzxw_s, gen_helper_gvec_sdot_idx_b) DO_RRXR(trans_SDOT_zzxw_d, gen_helper_gvec_sdot_idx_h) @@ -3840,7 +3840,7 @@ static bool trans_SUDOT_zzxw_s(DisasContext *s, arg_rrxr_esz *a) if (!dc_isar_feature(aa64_sve_i8mm, s)) { return false; } - return do_zzxz_ool(s, a, gen_helper_gvec_sudot_idx_b); + return gen_gvec_ool_arg_zzxz(s, gen_helper_gvec_sudot_idx_b, a); } static bool trans_USDOT_zzxw_s(DisasContext *s, arg_rrxr_esz *a) @@ -3848,7 +3848,7 @@ static bool trans_USDOT_zzxw_s(DisasContext *s, arg_rrxr_esz *a) if (!dc_isar_feature(aa64_sve_i8mm, s)) { return false; } - return do_zzxz_ool(s, a, gen_helper_gvec_usdot_idx_b); + return gen_gvec_ool_arg_zzxz(s, gen_helper_gvec_usdot_idx_b, a); } #undef DO_RRXR