[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v11 06/12] linux-user/elfload: Adjust iteration over phdr
From: |
Richard Henderson |
Subject: |
[PATCH v11 06/12] linux-user/elfload: Adjust iteration over phdr |
Date: |
Fri, 16 Oct 2020 11:42:01 -0700 |
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(-)
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;
}
}
--
2.25.1
- [PATCH v11 00/12] linux-user: User support for AArch64 BTI, Richard Henderson, 2020/10/16
- [PATCH v11 01/12] linux-user/aarch64: Reset btype for signals, Richard Henderson, 2020/10/16
- [PATCH v11 02/12] linux-user: Set PAGE_TARGET_1 for TARGET_PROT_BTI, Richard Henderson, 2020/10/16
- [PATCH v11 03/12] include/elf: Add defines related to GNU property notes for AArch64, Richard Henderson, 2020/10/16
- [PATCH v11 05/12] linux-user/elfload: Fix coding style in load_elf_image, Richard Henderson, 2020/10/16
- [PATCH v11 10/12] linux-user/elfload: Parse NT_GNU_PROPERTY_TYPE_0 notes, Richard Henderson, 2020/10/16
- [PATCH v11 06/12] linux-user/elfload: Adjust iteration over phdr,
Richard Henderson <=
- [PATCH v11 04/12] linux-user/elfload: Avoid leaking interp_name using GLib memory API, Richard Henderson, 2020/10/16
- [PATCH v11 09/12] linux-user/elfload: Use Error for load_elf_interp, Richard Henderson, 2020/10/16
- [PATCH v11 08/12] linux-user/elfload: Use Error for load_elf_image, Richard Henderson, 2020/10/16
- [PATCH v11 07/12] linux-user/elfload: Move PT_INTERP detection to first loop, Richard Henderson, 2020/10/16
- [PATCH v11 12/12] tests/tcg/aarch64: Add bti smoke tests, Richard Henderson, 2020/10/16
- [PATCH v11 11/12] linux-user/elfload: Parse GNU_PROPERTY_AARCH64_FEATURE_1_AND, Richard Henderson, 2020/10/16
- Re: [PATCH v11 00/12] linux-user: User support for AArch64 BTI, no-reply, 2020/10/16