From patchwork Fri Jun 26 15:14:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 191859 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp597883ilg; Fri, 26 Jun 2020 08:38:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2shSxlAPPduODZCYfFmZnsHALYe+qDkkMPWKVCmXGdfGU6e/CAoG4QRzg5HNG5AIGe5zw X-Received: by 2002:a5b:942:: with SMTP id x2mr6072571ybq.273.1593185913528; Fri, 26 Jun 2020 08:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593185913; cv=none; d=google.com; s=arc-20160816; b=XjjsIcqNeCMaEFEqoRyWuLWoP/WXK/SNEzJElwnY0TvfXmnwhJDqzB7rmnKsCluRwz +trTLYkywU9HAnaIM04uZ8v/RDXo7yIoMQxHecOGYPLr3RDgAN7AFx+nBpi50zte39iB P2Y7qbBRCjK/nOvUT8ueZhi4KnIpnzVLvIM1HCL31MCPo5Eh0fZBr3XwlpX68W8WU3Sx QQLRR5NN/XUsZPGfrJnQt8J6+kr1/6HrITVsPSOs8HNzkL4hgAEolcKRK72Q3CK1qZLR FNS2OiuGEUdl6apgZOn66Ubl1t4XHbcYdMMasDLqm7tRs/IjCy0ifz9XhMIZIIRQN4GU Pp/w== 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=bILgS802kOP5gR7fj6y5gd5HeqbKcxvhIhwFysJcVM8=; b=RJAEM6VfxWpyfft841QzztwcgHxSon6KG/cx5jvxY/nAurPt0fmDw2K5nNdQiFQcIK LEZO2z5GUmcAbTUp3HmzOCDn1uXwS664bqDDJ//8Jhu7LIH5zJEryZQ9zrYpsiEKZGAG h7ZXnNDe04XWcyCCq9INWS3/VOrQBBV9bdE7dU2LtoJ5kJYrIzX7nx23jyt1rdpkMECy UGklrdvpG0otGkp59Hv26KmyZodDe81zXUFcoy/AJdym1CeBUDOSdMoKQTxLJIDtggxN 4JaymU2KoFsiQQ+04RFqbJl2F8AyQw9VXIDMxknwtpPAdbbMBGIUv6GkXmV7suf6+aGc YCqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ikc5jYjQ; 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 s5si380717ybj.142.2020.06.26.08.38.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 08:38:33 -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=ikc5jYjQ; 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]:34464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joqQz-0002pU-0M for patch@linaro.org; Fri, 26 Jun 2020 11:38:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joq4Y-00037z-0w for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:15:22 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:38619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1joq4V-0006fL-1F for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:15:21 -0400 Received: by mail-wr1-x432.google.com with SMTP id z13so9869972wrw.5 for ; Fri, 26 Jun 2020 08:15:18 -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=bILgS802kOP5gR7fj6y5gd5HeqbKcxvhIhwFysJcVM8=; b=ikc5jYjQ856AR7oU5l2lo7qkhL6Lc7bpeAg9nDivQwnfosozM7k6Mx9I4AGgQmQ7tT lqYEth884Iw8y0c63t62p9OXgOESc0qXCCSRyOQ+UMPT/DAA6YopSzu/AlUuc52Fq1Ea ogtEol7VGp+sHAVsVejuWEDmwfrB/SvJ9jKVMd5yeLZEjweqClFoRDOaFyDWlU6RhxkD 65zjEEtulgaTS9ivpCmeHourc3PkENWyE3mYSEqM/8PNdhgLyetIVwfn+Efp1XFRHvWl yLfs9PHC75+JyLtPOMDRitHptRM/0emewHXOTRtpieZl8Ay/QrR1BjVMD0rGNtygt4Wj 3ZKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bILgS802kOP5gR7fj6y5gd5HeqbKcxvhIhwFysJcVM8=; b=NX+e3+rk2b3tjTpGg3ScXB7g8xAGDiFk5v3mmPR9+J8PG6r1aIXOnaTtu4AfwEHK2r K2xusyG/uMbIS/202/pnc7MifKwUHmeeGl61Rnpwz/voI5CPGssc5zlzZraSai/rWhFC eCWv7mSOXeIdegIzLqDvaSU81jEsOOUJw5LCK3f93jSsv88/33rpnSdV6yI91Gu1598T N3IawwuhZvaDdqkT1J58Us1MLb3y/kggPCmVWj+cxmpgt0oQp3ai5bdMV9HPfRNHZtUA YgsfSZoz8Ow8W+KwKvAOCaoHICHvDcLeqsg6xj1kCitxXaJ8J3DnEGBrkGJCxdE9oY76 +rZw== X-Gm-Message-State: AOAM530Y+86BmwUYWtPGfOquMyYPGNtT9pAIjfIue4Tn3YGmXeBsVej1 SZ9f+rIM43XxakhOD3qyd6qdrZuXT5Nkkg== X-Received: by 2002:a5d:4f0e:: with SMTP id c14mr4574072wru.410.1593184517379; Fri, 26 Jun 2020 08:15:17 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w13sm37838852wrr.67.2020.06.26.08.15.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 08:15:16 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 43/57] target/arm: Tidy trans_LD1R_zpri Date: Fri, 26 Jun 2020 16:14:10 +0100 Message-Id: <20200626151424.30117-44-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626151424.30117-1-peter.maydell@linaro.org> References: <20200626151424.30117-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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 Move the variable declarations to the top of the function, but do not create a new label before sve_access_check. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20200626033144.790098-32-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/translate-sve.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 4fa521989de..a3a0b98fbc5 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -4883,17 +4883,19 @@ static bool trans_LD1RQ_zpri(DisasContext *s, arg_rpri_load *a) /* Load and broadcast element. */ static bool trans_LD1R_zpri(DisasContext *s, arg_rpri_load *a) { - if (!sve_access_check(s)) { - return true; - } - unsigned vsz = vec_full_reg_size(s); unsigned psz = pred_full_reg_size(s); unsigned esz = dtype_esz[a->dtype]; unsigned msz = dtype_msz(a->dtype); - TCGLabel *over = gen_new_label(); + TCGLabel *over; TCGv_i64 temp, clean_addr; + if (!sve_access_check(s)) { + return true; + } + + over = gen_new_label(); + /* If the guarding predicate has no bits set, no load occurs. */ if (psz <= 8) { /* Reduce the pred_esz_masks value simply to reduce the