| Message ID | 20201016184207.786698-7-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | linux-user: User support for AArch64 BTI | expand |
On 10/16/20 8:42 PM, Richard Henderson wrote: > The second loop uses a loop induction variable, and the first > does not. Transform the first to match the second, to simplify > a following patch moving code between them. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > linux-user/elfload.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/linux-user/elfload.c b/linux-user/elfload.c > index 290ef70222..210592aa90 100644 > --- a/linux-user/elfload.c > +++ b/linux-user/elfload.c > @@ -2426,17 +2426,18 @@ static void load_elf_image(const char *image_name, int image_fd, > loaddr = -1, hiaddr = 0; > info->alignment = 0; > for (i = 0; i < ehdr->e_phnum; ++i) { > - if (phdr[i].p_type == PT_LOAD) { > - abi_ulong a = phdr[i].p_vaddr - phdr[i].p_offset; > + struct elf_phdr *eppnt = phdr + i; > + if (eppnt->p_type == PT_LOAD) { > + abi_ulong a = eppnt->p_vaddr - eppnt->p_offset; > if (a < loaddr) { > loaddr = a; > } > - a = phdr[i].p_vaddr + phdr[i].p_memsz; > + a = eppnt->p_vaddr + eppnt->p_memsz; > if (a > hiaddr) { > hiaddr = a; > } > ++info->nsegs; > - info->alignment |= phdr[i].p_align; > + info->alignment |= eppnt->p_align; > } > } > >
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 290ef70222..210592aa90 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2426,17 +2426,18 @@ static void load_elf_image(const char *image_name, int image_fd, loaddr = -1, hiaddr = 0; info->alignment = 0; for (i = 0; i < ehdr->e_phnum; ++i) { - if (phdr[i].p_type == PT_LOAD) { - abi_ulong a = phdr[i].p_vaddr - phdr[i].p_offset; + struct elf_phdr *eppnt = phdr + i; + if (eppnt->p_type == PT_LOAD) { + abi_ulong a = eppnt->p_vaddr - eppnt->p_offset; if (a < loaddr) { loaddr = a; } - a = phdr[i].p_vaddr + phdr[i].p_memsz; + a = eppnt->p_vaddr + eppnt->p_memsz; if (a > hiaddr) { hiaddr = a; } ++info->nsegs; - info->alignment |= phdr[i].p_align; + info->alignment |= eppnt->p_align; } }
The second loop uses a loop induction variable, and the first does not. Transform the first to match the second, to simplify a following patch moving code between them. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- linux-user/elfload.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)