[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 4/9] dump: Remove the section if when calculating the memory o
From: |
Janosch Frank |
Subject: |
[PATCH v3 4/9] dump: Remove the section if when calculating the memory offset |
Date: |
Wed, 30 Mar 2022 12:35:58 +0000 |
When s->shdr_num is 0 we'll add 0 bytes of section headers which is
equivalent to not adding section headers but with the multiplication
we can remove a if/else.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
dump/dump.c | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/dump/dump.c b/dump/dump.c
index cd11dec0f4..bdff651da4 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -1808,23 +1808,15 @@ static void dump_init(DumpState *s, int fd, bool
has_format,
}
if (s->dump_info.d_class == ELFCLASS64) {
- if (s->shdr_num) {
- s->memory_offset = sizeof(Elf64_Ehdr) +
- sizeof(Elf64_Phdr) * s->phdr_num +
- sizeof(Elf64_Shdr) * s->shdr_num + s->note_size;
- } else {
- s->memory_offset = sizeof(Elf64_Ehdr) +
- sizeof(Elf64_Phdr) * s->phdr_num + s->note_size;
- }
+ s->memory_offset = sizeof(Elf64_Ehdr) +
+ sizeof(Elf64_Phdr) * s->phdr_num +
+ sizeof(Elf64_Shdr) * s->shdr_num +
+ s->note_size;
} else {
- if (s->shdr_num) {
- s->memory_offset = sizeof(Elf32_Ehdr) +
- sizeof(Elf32_Phdr) * s->phdr_num +
- sizeof(Elf32_Shdr) * s->shdr_num + s->note_size;
- } else {
- s->memory_offset = sizeof(Elf32_Ehdr) +
- sizeof(Elf32_Phdr) * s->phdr_num + s->note_size;
- }
+ s->memory_offset = sizeof(Elf32_Ehdr) +
+ sizeof(Elf32_Phdr) * s->phdr_num +
+ sizeof(Elf32_Shdr) * s->shdr_num +
+ s->note_size;
}
return;
--
2.32.0
- Re: [PATCH v3 3/9] dump: Introduce shdr_num to decrease complexity, (continued)
- [PATCH v3 5/9] dump: Add more offset variables, Janosch Frank, 2022/03/30
- [PATCH v3 2/9] dump: Remove the sh_info variable, Janosch Frank, 2022/03/30
- [PATCH v3 6/9] dump: Introduce dump_is_64bit() helper function, Janosch Frank, 2022/03/30
- [PATCH v3 9/9] dump: Consolidate elf note function, Janosch Frank, 2022/03/30
- [PATCH v3 8/9] dump: Cleanup dump_begin write functions, Janosch Frank, 2022/03/30
- [PATCH v3 4/9] dump: Remove the section if when calculating the memory offset,
Janosch Frank <=