[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/48] linux-user/elfload: Adjust iteration over phdr
From: |
Peter Maydell |
Subject: |
[PULL 06/48] linux-user/elfload: Adjust iteration over phdr |
Date: |
Tue, 27 Oct 2020 11:43:56 +0000 |
From: Richard Henderson <richard.henderson@linaro.org>
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>
---
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 290ef70222b..210592aa90a 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;
}
}
--
2.20.1
- [PULL 00/48] target-arm queue, Peter Maydell, 2020/10/27
- [PULL 01/48] linux-user/aarch64: Reset btype for signals, Peter Maydell, 2020/10/27
- [PULL 05/48] linux-user/elfload: Fix coding style in load_elf_image, Peter Maydell, 2020/10/27
- [PULL 10/48] linux-user/elfload: Parse NT_GNU_PROPERTY_TYPE_0 notes, Peter Maydell, 2020/10/27
- [PULL 08/48] linux-user/elfload: Use Error for load_elf_image, Peter Maydell, 2020/10/27
- [PULL 04/48] linux-user/elfload: Avoid leaking interp_name using GLib memory API, Peter Maydell, 2020/10/27
- [PULL 02/48] linux-user: Set PAGE_TARGET_1 for TARGET_PROT_BTI, Peter Maydell, 2020/10/27
- [PULL 09/48] linux-user/elfload: Use Error for load_elf_interp, Peter Maydell, 2020/10/27
- [PULL 03/48] include/elf: Add defines related to GNU property notes for AArch64, Peter Maydell, 2020/10/27
- [PULL 06/48] linux-user/elfload: Adjust iteration over phdr,
Peter Maydell <=
- [PULL 07/48] linux-user/elfload: Move PT_INTERP detection to first loop, Peter Maydell, 2020/10/27
- [PULL 13/48] hw/arm/highbank: Silence warnings about missing fallthrough statements, Peter Maydell, 2020/10/27
- [PULL 14/48] hw/arm: fix min_cpus for xlnx-versal-virt platform, Peter Maydell, 2020/10/27
- [PULL 15/48] Move npcm7xx_timer_reached_zero call out of npcm7xx_timer_pause, Peter Maydell, 2020/10/27
- [PULL 17/48] hw/misc: Add npcm7xx random number generator, Peter Maydell, 2020/10/27
- [PULL 16/48] hw/timer: Adding watchdog for NPCM7XX Timer., Peter Maydell, 2020/10/27
- [PULL 11/48] linux-user/elfload: Parse GNU_PROPERTY_AARCH64_FEATURE_1_AND, Peter Maydell, 2020/10/27
- [PULL 12/48] tests/tcg/aarch64: Add bti smoke tests, Peter Maydell, 2020/10/27
- [PULL 18/48] hw/arm/npcm7xx: Add EHCI and OHCI controllers, Peter Maydell, 2020/10/27
- [PULL 20/48] hw/arm/smmuv3: Set the restoration priority of the vSMMUv3 explicitly, Peter Maydell, 2020/10/27