From nobody Tue Feb 10 12:59:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1695616360; cv=none; d=zohomail.com; s=zohoarc; b=aKNj5Tbhfy9sUPg/mhkHbOr8wsJCQG8VWwT7a4A6ImW56xqqP8hKh1Dsyb5D0TPFNLzGJS4iYL/zZEntObqfRfK/mdJ1wwqjc2iBLyn/aMGStL03hCm7sIGbWfo/HKd8Ohut5N1p04PC8801VH7rseeVObz99/W4c/0RG3BJHWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695616360; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vbzU6PuAtTUzb6Apd7sQVmg+mcHLI4MPchfruHrfnq4=; b=Pu9XCP+Ix0yGBFBiCMX3oKNV+Xtw7W38swpk+C0vPx4EmrKj5dVEmAGavw1pii1ETvEsbUwWYOmpYaLLMNSHgvYGQAyNHUsEY0Q6PeiaNSY5YbokchOW37ta6D/Hb6KVnaTCoRFwrfmwfspcw+7z+NDLgnhTMZtwBGs5P4ckiho= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695616360948191.87632317425152; Sun, 24 Sep 2023 21:32:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qkdFP-0002xw-JS; Mon, 25 Sep 2023 00:31:03 -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 1qkdFN-0002vC-Cv; Mon, 25 Sep 2023 00:31:01 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qkdFD-0007Wc-BZ; Mon, 25 Sep 2023 00:30:53 -0400 Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-2773523b2b6so886258a91.2; Sun, 24 Sep 2023 21:30:50 -0700 (PDT) Received: from toolbox.alistair23.me (2403-580b-97e8-0-321-6fb2-58f1-a1b1.ip6.aussiebb.net. [2403:580b:97e8:0:321:6fb2:58f1:a1b1]) by smtp.gmail.com with ESMTPSA id y14-20020a17090a134e00b00276fef82025sm6002161pjf.35.2023.09.24.21.30.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 21:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695616249; x=1696221049; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vbzU6PuAtTUzb6Apd7sQVmg+mcHLI4MPchfruHrfnq4=; b=CCFKEMd151qE4fEBGJzbESBuSZAkWVKr+PtMf9CMFlrvvOeVUl08zdymkICfDWmi1m fkmdtKFMLwM/MRtoy4QsgnMzyuUeLlyENE/1a2Pq7FNX3pYa61Hm+KuTjnHZd5BP6dUa 9qLpyhefA2HMKD44kHQkGjltCv7AtX4piVg9DHNdvaSIyERb3azuA0PmNp1IvMxQhcgO CcFRgtcMuvmwuzSLiEj7n2UjaHbox/DOmo4NuBCQVka1LhtebWV6l7P/QrreUpWoQ7Bw A2z28qobBjJgGCHoE4rZqxPqyJt4I2p2ZNdCbC8ZxMVtau4/Bv6G86AWz34IrjM905k7 p+Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695616249; x=1696221049; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vbzU6PuAtTUzb6Apd7sQVmg+mcHLI4MPchfruHrfnq4=; b=odZSudU4tRu7HM6U4eMSdG66LuAOGRVpMhDapRjqvHvt7hW+1ty7UpRRfoPJvs0oxB 3nv8IhQ76thq03PgPsE0VV8w9K3P0CVb/NZXLz6+REopvTEipCFsSmiqyiIn0+5gMEbP G+1sdsge9XevRvvqUc/yfqHd3gRC9Y+b3HJHee2eHiBSCIQyuO73j8wweRd+lbIT7iOn RnjXU83TTPoi+Iyk+KodYgWvXOgyhADJU3BJYosAIqtmK22RbJrB8ka3CHMcrhUjwBdp yPve6AW0lE+dvEkdSShU0KD8rRtqRr7+ihymABcjEttGZdQrlVkbGo4UdvWEY8qnmA+U sa3g== X-Gm-Message-State: AOJu0YyLa03N51P11Pm4X3RhRIYoijO7vj6c7DYsdUQ6wqWSNqnTXZDM /bucHS/hPWYuYfBrUgy+qpo= X-Google-Smtp-Source: AGHT+IF2MFlbGEMFluAhFsg0/sJ9YANolk5k0QJe81NJ8MLRdR9quSLqHuSpx6rHbxORHb8guZ/tQQ== X-Received: by 2002:a17:90a:f016:b0:26d:3ad:7c83 with SMTP id bt22-20020a17090af01600b0026d03ad7c83mr3241519pjb.13.1695616249409; Sun, 24 Sep 2023 21:30:49 -0700 (PDT) From: Alistair Francis X-Google-Original-From: Alistair Francis To: david@gibson.dropbear.id.au, qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: bmeng.cn@gmail.com, alistair.francis@wdc.com, Liu Zhiwei , palmer@dabbelt.com, alistair23@gmail.com, dbarboza@ventanamicro.com, Alistair Francis , liweiwei@iscas.ac.cn, Bin Meng Subject: [PATCH 3/4] target/riscv: vector_helper: Fixup local variables shadowing Date: Mon, 25 Sep 2023 14:30:22 +1000 Message-ID: <20230925043023.71448-4-alistair.francis@wdc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230925043023.71448-1-alistair.francis@wdc.com> References: <20230925043023.71448-1-alistair.francis@wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=alistair23@gmail.com; helo=mail-pj1-x1032.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1695616361953100003 Content-Type: text/plain; charset="utf-8" Local variables shadowing other local variables or parameters make the code needlessly hard to understand. Bugs love to hide in such code. Evidence: "[PATCH v3 1/7] migration/rdma: Fix save_page method to fail on polling error". This patch removes the local variable shadowing. Tested by adding: --extra-cflags=3D'-Wshadow=3Dlocal -Wno-error=3Dshadow=3Dlocal -Wno-err= or=3Dshadow=3Dcompatible-local' To configure Signed-off-by: Alistair Francis Reviewed-by: Daniel Henrique Barboza --- target/riscv/vector_helper.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c index 3fb05cc3d6..cba02c1320 100644 --- a/target/riscv/vector_helper.c +++ b/target/riscv/vector_helper.c @@ -516,7 +516,7 @@ ProbeSuccess: k++; continue; } - target_ulong addr =3D base + ((i * nf + k) << log2_esz); + addr =3D base + ((i * nf + k) << log2_esz); ldst_elem(env, adjust_addr(env, addr), i + k * max_elems, vd, = ra); k++; } @@ -4791,9 +4791,10 @@ void HELPER(NAME)(void *vd, void *v0, target_ulong s= 1, void *vs2, \ uint32_t total_elems =3D vext_get_total_elems(env, desc, esz); = \ uint32_t vta =3D vext_vta(desc); = \ uint32_t vma =3D vext_vma(desc); = \ - target_ulong i_max, i; \ + target_ulong i_max, i_min, i; \ \ - i_max =3D MAX(MIN(s1 < vlmax ? vlmax - s1 : 0, vl), env->vstart); = \ + i_min =3D MIN(s1 < vlmax ? vlmax - s1 : 0, vl); = \ + i_max =3D MAX(i_min, env->vstart); = \ for (i =3D env->vstart; i < i_max; ++i) { = \ if (!vm && !vext_elem_mask(v0, i)) { \ /* set masked-off elements to 1s */ \ --=20 2.41.0