From patchwork Mon May 30 16:05:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 577226 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:330b:0:0:0:0 with SMTP id f11csp404738mag; Mon, 30 May 2022 09:48:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxdBalMH+FGstRkuCW0TAtLWYHOohNZ7DE+Ta2CiGXdDBJ3rlb/nMJq9zFcHyGsXyAEOTU X-Received: by 2002:a05:620a:46a5:b0:6a5:8dca:d2fb with SMTP id bq37-20020a05620a46a500b006a58dcad2fbmr20105417qkb.621.1653929306389; Mon, 30 May 2022 09:48:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653929306; cv=none; d=google.com; s=arc-20160816; b=G1ACdKq9dhARJJE0Yr/JWTKdoaAGvA7Lk/KvcbRk31YrRDwu/QH0D/nLN5Rqkf7i5/ 9GbM6XKBKmzoVXcilcILM0cq4b6ZwO9tkvRiOcuTcUCf4OUUyQt2XTafr2z54bJJR0mr oUR4D+dRNjd6TWI69NORmtw9oo2bUYjSh6q4vZZgGsfYvAmPavVqqxiYeO7aqE0E8xDK mvZuaN+ckKuuilwh43dZ5ylAESJcvWRhx4+iXukOrRT5N+noXO7REtKQlG5tAzqJRyMt 5WGXCh/wPVwdShLcJvisDGrMwUX2bIW9Ml6nzZ7fD43jvahiljEDsMTz/FFO5GTOMOEb L7NA== 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=cpd7D4YK0XMRZCXxov+SnKlbCAxYBEy6m0qpqFZT8lo=; b=Y7ecYkxONjwZGi01d2wCU6IG36+ke2iAfsisDp/nYgbc1PQpOZ3sKl4tHgsdN8bwyu YGNqQ5b2n/7r9HBHI8+gItZbC5zQPFF6ufrDVXW59M3JpBvBZc0JLweEg2nawWtpX9fZ Wrr09ftaPZB2V4wGrACVR26TBYm7fOtOdP35ElUJoVtdzqIfEhBH3EgYzxI6u2d+gcWA aZ79a6V7aYr2EPAPq7Tod/+RzOLNqSu1sHBlfr+4KBu1RjBZTKhG2MOQ5BUmj9Y9KAEm zZ7lGOtnmdN2AQFRqrtZBTwgUQbxjal3EHDuhIQJiUGe60e3kXZPY8AOFmjF+T5qoz+9 FRzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="LpV/oJUy"; 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 h8-20020ac85848000000b002f93473c71fsi7194187qth.201.2022.05.30.09.48.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 May 2022 09:48:26 -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="LpV/oJUy"; 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]:36340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nviZ7-0000SY-Tu for patch@linaro.org; Mon, 30 May 2022 12:48:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvhvj-0003Lt-Ut for qemu-devel@nongnu.org; Mon, 30 May 2022 12:07:44 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:55933) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nvhve-0007HV-Vj for qemu-devel@nongnu.org; Mon, 30 May 2022 12:07:43 -0400 Received: by mail-wm1-x32e.google.com with SMTP id y24so6636157wmq.5 for ; Mon, 30 May 2022 09:07:38 -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=cpd7D4YK0XMRZCXxov+SnKlbCAxYBEy6m0qpqFZT8lo=; b=LpV/oJUyIjtUVBzTG+HxygkOTnTiUd1XRn2jlNLUFx+HzhuZ7oBhcQmqFlKQ4sMnuY 6Ym4Ca7cjGHcZekYBpMlSE5aO/KOXmHjYYrxkGyk2FFgh4BT2/taZzN4iqN3c9TzVAXV ib9MAW+dz3KM4+WWqSu+UPd7GguqLCIfKIEkEZ9EgGw0XJmk55MT7mhg7LCpEXF3Q7Xm e6Nl14GSO8k3lDcsN57SGRkGzIKJtAuKGEm/u1AWc2v/aLz8sVrg0kxZGFueyn7Y+AWn Lq6Rpk5qBqnP7eUb0WsmquXJO19AGZvlieB9MJkf0f7J1zpvNtEYjgBzQvocchqEtRvL EJxw== 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=cpd7D4YK0XMRZCXxov+SnKlbCAxYBEy6m0qpqFZT8lo=; b=NmodFmGXNmyHavkOf6FwpA6qw8rHBYiqI1t8Ptxky2poYXy3ID7n7u6q/4e/n4S8Kb WdPLFQMdSB0S/oq99idcvcKGDxn0cVLnloItxOP/TA/zjYN5yFdjPk+6OWyDTJCJrnSI 4l6euJmIxKFjRuHXnIdEAJKaCeN19iEUZ6V5p0TA7S5XCC/2fMZx/g1juxWhkLyVknaS lVo8mSbgYpMgfX97qF50IqflMTAwKOD0tb1CwKYV+fb2QKGVY5m1dI/tWihAQvDggiQR AL+KdnRBbcocVt3zGZehJsvbAx9GF2GfGNIx2A2+WmveByjM57Ik4Th6+rtl/TB6u2L2 Iz4A== X-Gm-Message-State: AOAM5310Nmk+d0WhbxFoYjsriFGE/R/M1R2PX1eSvTT7Z5IH3Id7WYFH 1amQl0DkGqz7vtIbKyUboaTgtbId0hLr9A== X-Received: by 2002:a05:600c:1d28:b0:397:65ab:4b3e with SMTP id l40-20020a05600c1d2800b0039765ab4b3emr19666934wms.137.1653926857460; Mon, 30 May 2022 09:07:37 -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.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 09:07:37 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 034/117] target/arm: Rename do_zzz_fn to gen_gvec_fn_arg_zzz Date: Mon, 30 May 2022 17:05:45 +0100 Message-Id: <20220530160708.726466-35-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::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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_fn_zzz, and move to be adjacent. Signed-off-by: Richard Henderson Message-id: 20220527181907.189259-32-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/translate-sve.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 3af4626e58a..1b3afcc24cf 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -274,6 +274,12 @@ static bool gen_gvec_fn_zzz(DisasContext *s, GVecGen3Fn *gvec_fn, return true; } +static bool gen_gvec_fn_arg_zzz(DisasContext *s, GVecGen3Fn *fn, + arg_rrr_esz *a) +{ + return gen_gvec_fn_zzz(s, fn, a->esz, a->rd, a->rn, a->rm); +} + /* Invoke a vector expander on four Zregs. */ static void gen_gvec_fn_zzzz(DisasContext *s, GVecGen4Fn *gvec_fn, int esz, int rd, int rn, int rm, int ra) @@ -370,29 +376,24 @@ const uint64_t pred_esz_masks[4] = { *** SVE Logical - Unpredicated Group */ -static bool do_zzz_fn(DisasContext *s, arg_rrr_esz *a, GVecGen3Fn *gvec_fn) -{ - return gen_gvec_fn_zzz(s, gvec_fn, a->esz, a->rd, a->rn, a->rm); -} - static bool trans_AND_zzz(DisasContext *s, arg_rrr_esz *a) { - return do_zzz_fn(s, a, tcg_gen_gvec_and); + return gen_gvec_fn_arg_zzz(s, tcg_gen_gvec_and, a); } static bool trans_ORR_zzz(DisasContext *s, arg_rrr_esz *a) { - return do_zzz_fn(s, a, tcg_gen_gvec_or); + return gen_gvec_fn_arg_zzz(s, tcg_gen_gvec_or, a); } static bool trans_EOR_zzz(DisasContext *s, arg_rrr_esz *a) { - return do_zzz_fn(s, a, tcg_gen_gvec_xor); + return gen_gvec_fn_arg_zzz(s, tcg_gen_gvec_xor, a); } static bool trans_BIC_zzz(DisasContext *s, arg_rrr_esz *a) { - return do_zzz_fn(s, a, tcg_gen_gvec_andc); + return gen_gvec_fn_arg_zzz(s, tcg_gen_gvec_andc, a); } static void gen_xar8_i64(TCGv_i64 d, TCGv_i64 n, TCGv_i64 m, int64_t sh) @@ -707,32 +708,32 @@ static bool trans_NBSL(DisasContext *s, arg_rrrr_esz *a) static bool trans_ADD_zzz(DisasContext *s, arg_rrr_esz *a) { - return do_zzz_fn(s, a, tcg_gen_gvec_add); + return gen_gvec_fn_arg_zzz(s, tcg_gen_gvec_add, a); } static bool trans_SUB_zzz(DisasContext *s, arg_rrr_esz *a) { - return do_zzz_fn(s, a, tcg_gen_gvec_sub); + return gen_gvec_fn_arg_zzz(s, tcg_gen_gvec_sub, a); } static bool trans_SQADD_zzz(DisasContext *s, arg_rrr_esz *a) { - return do_zzz_fn(s, a, tcg_gen_gvec_ssadd); + return gen_gvec_fn_arg_zzz(s, tcg_gen_gvec_ssadd, a); } static bool trans_SQSUB_zzz(DisasContext *s, arg_rrr_esz *a) { - return do_zzz_fn(s, a, tcg_gen_gvec_sssub); + return gen_gvec_fn_arg_zzz(s, tcg_gen_gvec_sssub, a); } static bool trans_UQADD_zzz(DisasContext *s, arg_rrr_esz *a) { - return do_zzz_fn(s, a, tcg_gen_gvec_usadd); + return gen_gvec_fn_arg_zzz(s, tcg_gen_gvec_usadd, a); } static bool trans_UQSUB_zzz(DisasContext *s, arg_rrr_esz *a) { - return do_zzz_fn(s, a, tcg_gen_gvec_ussub); + return gen_gvec_fn_arg_zzz(s, tcg_gen_gvec_ussub, a); } /*