vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user/elfload: Adjust iteration over phdr 

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>
Message-id: 20201021173749.111103-7-richard.henderson@linaro.org
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
master
Richard Henderson 2020-10-21 10:37:43 -07:00 committed by Peter Maydell
parent e5eaf570a3
commit 4d9d535a8a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
linux-user/elfload.c
View File

@ -2426,17 +2426,18 @@ static void load_elf_image(const char *image_name, int image_fd,
loaddr = -1, hiaddr = 0; loaddr = -1, hiaddr = 0;
info->alignment = 0; info->alignment = 0;
for (i = 0; i < ehdr->e_phnum; ++i) { for (i = 0; i < ehdr->e_phnum; ++i) {
if (phdr[i].p_type == PT_LOAD) { struct elf_phdr *eppnt = phdr + i;
abi_ulong a = phdr[i].p_vaddr - phdr[i].p_offset; if (eppnt->p_type == PT_LOAD) {
abi_ulong a = eppnt->p_vaddr - eppnt->p_offset;
if (a < loaddr) { if (a < loaddr) {
loaddr = a; loaddr = a;
} }
a = phdr[i].p_vaddr + phdr[i].p_memsz; a = eppnt->p_vaddr + eppnt->p_memsz;
if (a > hiaddr) { if (a > hiaddr) {
hiaddr = a; hiaddr = a;
} }
++info->nsegs; ++info->nsegs;
info->alignment |= phdr[i].p_align; info->alignment |= eppnt->p_align;
} }
} }