target/riscv: vector_helper: Fixup local variables shadowing

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='-Wshadow=local -Wno-error=shadow=local -Wno-error=shadow=compatible-local'

To configure

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20230925043023.71448-4-alistair.francis@wdc.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Alistair Francis 2023-09-25 14:30:22 +10:00 committed by Markus Armbruster
parent 29332994d8
commit f3f65c4022

View File

@ -516,7 +516,7 @@ ProbeSuccess:
k++; k++;
continue; continue;
} }
target_ulong addr = base + ((i * nf + k) << log2_esz); addr = base + ((i * nf + k) << log2_esz);
ldst_elem(env, adjust_addr(env, addr), i + k * max_elems, vd, ra); ldst_elem(env, adjust_addr(env, addr), i + k * max_elems, vd, ra);
k++; k++;
} }
@ -4791,9 +4791,10 @@ void HELPER(NAME)(void *vd, void *v0, target_ulong s1, void *vs2, \
uint32_t total_elems = vext_get_total_elems(env, desc, esz); \ uint32_t total_elems = vext_get_total_elems(env, desc, esz); \
uint32_t vta = vext_vta(desc); \ uint32_t vta = vext_vta(desc); \
uint32_t vma = vext_vma(desc); \ uint32_t vma = vext_vma(desc); \
target_ulong i_max, i; \ target_ulong i_max, i_min, i; \
\ \
i_max = MAX(MIN(s1 < vlmax ? vlmax - s1 : 0, vl), env->vstart); \ i_min = MIN(s1 < vlmax ? vlmax - s1 : 0, vl); \
i_max = MAX(i_min, env->vstart); \
for (i = env->vstart; i < i_max; ++i) { \ for (i = env->vstart; i < i_max; ++i) { \
if (!vm && !vext_elem_mask(v0, i)) { \ if (!vm && !vext_elem_mask(v0, i)) { \
/* set masked-off elements to 1s */ \ /* set masked-off elements to 1s */ \