From patchwork Mon May 30 16:06:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 577285 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:330b:0:0:0:0 with SMTP id f11csp452182mag; Mon, 30 May 2022 10:50:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4XhChxCAVc6dpI4xwVxSwDyrW5hd1mVpap29TNCinn3Oa2tIUNXZIAhDaGr7CbkRMlFFx X-Received: by 2002:ad4:4ee6:0:b0:462:6af5:dcfc with SMTP id dv6-20020ad44ee6000000b004626af5dcfcmr19697564qvb.22.1653933043505; Mon, 30 May 2022 10:50:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653933043; cv=none; d=google.com; s=arc-20160816; b=ggx2dKDxr1h78Gvn+sDsm3kdFBJbrs63XqA4AL4Vd3I+87aZdmAqFDrMkyryc0ApH7 MZn1Q2BD3QYbYyzTUbXMc0vNXrFSDl12NLh+UaDpp97SYek0kQW7gikz4nByPEzY48MW tNGOy084yOC1wDlNSYKguYzY6EFMlbTwGGWX/VpZuyRFxud3uDzAOQye2PcJcRCU+w+v 5OPHDkcMA5ET/RuNJUV6/btkrp7DqqOHJ2GUCxcX377J8YIXAuZUqR47bOq7obp1Nmo2 xwt5MnR9nNyPShYkEyRh76LYbYNB4BsONhwU/W6aRr5iLXabBXIQwQd7xRPwZPi0vRgT RN4g== 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=wHCM3DuHcG7rVU3FS0qi4j15U6ruRI2FEaCIBxFBBAM=; b=vpALqJR8DWWLqvMm0iIXZzgSIggd2PJftHJ0Ax3zB5wVgBugl1bewYPRnufER6Mdgj v+ampcez80GsAryZkO5zkbv0f5IMnnFjMJq9FBpHpItX/thOdWZkDhngyvOdKn7/boq9 xYsyQonLXR3D7NFwY6aF0en7Fkmtk38EmV3xdCITCcQPwLJ6qcPido22c18j0NmrROdc DtF8liK/f4P0fDsEJOb6ZPzX6aKT5ovSZzkFut/l1DqvBCgFX6aNaf3mE8NTjaHs9/Ii cwRxH6XlYNlA3+UyPZbIydq7GyTWgDcnR6w38bpBTPgM9QwLEwIBLIkYz5eXHQSuLNPk NmLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aJITZzCx; 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 l192-20020a37a2c9000000b006a5aacb0609si7264821qke.556.2022.05.30.10.50.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 May 2022 10:50:43 -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=aJITZzCx; 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]:37984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvjXP-0007QY-0R for patch@linaro.org; Mon, 30 May 2022 13:50:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvhwe-00049H-E3 for qemu-devel@nongnu.org; Mon, 30 May 2022 12:08:40 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:44003) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nvhwa-0007T9-IY for qemu-devel@nongnu.org; Mon, 30 May 2022 12:08:40 -0400 Received: by mail-wm1-x329.google.com with SMTP id 67-20020a1c1946000000b00397382b44f4so6714409wmz.2 for ; Mon, 30 May 2022 09:08:36 -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=wHCM3DuHcG7rVU3FS0qi4j15U6ruRI2FEaCIBxFBBAM=; b=aJITZzCxGl+VwuKjQJbpWfc86DlV8bORjs45zXuO92ytvZ4qSmZevczGB9oD4S8gM6 XxvsXfSP5YbEHT/ygnYAQ8xaZrLe/+BZ4rDhdKxi+Dm/YFh1PQMZZCALWcKIH4WWygzw idhOgDErnntt1JV5Pmt7pvvrTbJR3gBInu1bkPTqKL8CF5BQEsjaoreC6xr1xCOQECs9 n1OLI+/ZmvG9Q4xVZoschgl2+5slTmcZrdZEx+RkaF5LgJH3hngP0WpjIzAbWo3PYFdK xmpEeptd1FZNTA18s6cxtYsf0tpmeR4JKK7+7GtY+S9/kCiQG/zwmrcTT3Aicm8zHIG1 +ogQ== 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=wHCM3DuHcG7rVU3FS0qi4j15U6ruRI2FEaCIBxFBBAM=; b=6tf+DV8ycMlHV20kvDiZ8c2Bin0OkMVtYFnQbDC1xwY4VARI+eLbrHPKfZ2NnHzkvk UpYA6G3MB7PLDH00k4BXqxE6sgkSwqBCQZtGJqzXlqMqDa91f2kTEwuEyQsqlyOEL8+b 0XbW+yVeR5uTKFDLfCRlFPR4DKhtgrTv0mipF9btIKnUiCM+12WV2/bc1a6W0B5/TSvg acffeznhArYvsLRi9S6lImvU5Zpy2X1OB8hwZqC61vs6+CwKzTk1/1vIx+BmFcNwV5BW +eHC8oUbpDJqNNRayZPffr5eDo5bBYWUwxRjwxGiS8oPLua0RIz+vzbDIOjSO2827TUx QkKg== X-Gm-Message-State: AOAM533v+0CJIUU06Qalo/vtelwXpQo4bhRHiZvaeG5Dw+piLMrKcgeL rX8brdqAiZsG0iyNEiBUbrOGsqFlaH+K8w== X-Received: by 2002:a05:600c:2254:b0:397:581d:34fa with SMTP id a20-20020a05600c225400b00397581d34famr19882866wmm.181.1653926915168; Mon, 30 May 2022 09:08:35 -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.08.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 09:08:34 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 095/117] target/arm: Expand frint_fns for MO_8 Date: Mon, 30 May 2022 17:06:46 +0100 Message-Id: <20220530160708.726466-96-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 Simplify indexing of this array. This will allow folding of the illegal esz == 0 into the normal fn == NULL check. Signed-off-by: Richard Henderson Message-id: 20220527181907.189259-93-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/translate-sve.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 2f7651249ad..99e5d896457 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -4167,7 +4167,8 @@ static bool trans_FCVTZU_dd(DisasContext *s, arg_rpr_esz *a) return do_zpz_ptr(s, a->rd, a->rn, a->pg, false, gen_helper_sve_fcvtzu_dd); } -static gen_helper_gvec_3_ptr * const frint_fns[3] = { +static gen_helper_gvec_3_ptr * const frint_fns[] = { + NULL, gen_helper_sve_frint_h, gen_helper_sve_frint_s, gen_helper_sve_frint_d @@ -4179,7 +4180,7 @@ static bool trans_FRINTI(DisasContext *s, arg_rpr_esz *a) return false; } return do_zpz_ptr(s, a->rd, a->rn, a->pg, a->esz == MO_16, - frint_fns[a->esz - 1]); + frint_fns[a->esz]); } static bool trans_FRINTX(DisasContext *s, arg_rpr_esz *a) @@ -4222,7 +4223,7 @@ static bool trans_FRINTN(DisasContext *s, arg_rpr_esz *a) if (a->esz == 0) { return false; } - return do_frint_mode(s, a, float_round_nearest_even, frint_fns[a->esz - 1]); + return do_frint_mode(s, a, float_round_nearest_even, frint_fns[a->esz]); } static bool trans_FRINTP(DisasContext *s, arg_rpr_esz *a) @@ -4230,7 +4231,7 @@ static bool trans_FRINTP(DisasContext *s, arg_rpr_esz *a) if (a->esz == 0) { return false; } - return do_frint_mode(s, a, float_round_up, frint_fns[a->esz - 1]); + return do_frint_mode(s, a, float_round_up, frint_fns[a->esz]); } static bool trans_FRINTM(DisasContext *s, arg_rpr_esz *a) @@ -4238,7 +4239,7 @@ static bool trans_FRINTM(DisasContext *s, arg_rpr_esz *a) if (a->esz == 0) { return false; } - return do_frint_mode(s, a, float_round_down, frint_fns[a->esz - 1]); + return do_frint_mode(s, a, float_round_down, frint_fns[a->esz]); } static bool trans_FRINTZ(DisasContext *s, arg_rpr_esz *a) @@ -4246,7 +4247,7 @@ static bool trans_FRINTZ(DisasContext *s, arg_rpr_esz *a) if (a->esz == 0) { return false; } - return do_frint_mode(s, a, float_round_to_zero, frint_fns[a->esz - 1]); + return do_frint_mode(s, a, float_round_to_zero, frint_fns[a->esz]); } static bool trans_FRINTA(DisasContext *s, arg_rpr_esz *a) @@ -4254,7 +4255,7 @@ static bool trans_FRINTA(DisasContext *s, arg_rpr_esz *a) if (a->esz == 0) { return false; } - return do_frint_mode(s, a, float_round_ties_away, frint_fns[a->esz - 1]); + return do_frint_mode(s, a, float_round_ties_away, frint_fns[a->esz]); } static bool trans_FRECPX(DisasContext *s, arg_rpr_esz *a)