#define SCNFILESIZE(shdr) ((shdr)->sh_type == SHT_NOBITS ? 0 : (shdr)->sh_size)
-int elfu_gPhdrContainsScn(GElf_Phdr *phdr, GElf_Shdr *shdr);
+
+#define PHDR_CONTAINS_SCN_IN_MEMORY(phdr, shdr) \
+ (((phdr)->p_vaddr) <= ((shdr)->sh_addr) \
+ && OFFS_END((shdr)->sh_addr, (shdr)->sh_size) <= OFFS_END((phdr)->p_vaddr, (phdr)->p_memsz))
+
+#define PHDR_CONTAINS_SCN_IN_FILE(phdr, shdr) \
+ (((phdr)->p_offset) <= ((shdr)->sh_offset) \
+ && OFFS_END((shdr)->sh_offset, SCNFILESIZE(shdr)) <= OFFS_END((phdr)->p_offset, (phdr)->p_filesz))
#endif
}
if (shdr.sh_offset == phdr->p_offset
- && elfu_gPhdrContainsScn(phdr, &shdr)) {
+ && PHDR_CONTAINS_SCN_IN_MEMORY(phdr, &shdr)) {
return scn;
}
continue;
}
- if (elfu_gPhdrContainsScn(phdr, &shdr)) {
+ if (PHDR_CONTAINS_SCN_IN_MEMORY(phdr, &shdr)) {
if (!last) {
last = scn;
} else {
+++ /dev/null
-#include <libelf/libelf.h>
-#include <libelf/gelf.h>
-
-#include <libelfu/libelfu.h>
-
-
-int elfu_gPhdrContainsScn(GElf_Phdr *phdr, GElf_Shdr *shdr)
-{
- size_t secStart = shdr->sh_offset;
- size_t secEnd = shdr->sh_offset + shdr->sh_size;
- size_t segStart = phdr->p_offset;
- size_t segEnd = phdr->p_offset + phdr->p_memsz;
-
- if (secStart < segStart || secEnd > segEnd) {
- return 0;
- }
-
- return 1;
-}
continue;
}
- if (elfu_gPhdrContainsScn(&phdr, &shdr)) {
+ if (PHDR_CONTAINS_SCN_IN_MEMORY(&phdr, &shdr)) {
printf(" %d %s\n", i, segmentTypeStr(phdr.p_type));
}
}
continue;
}
- if (elfu_gPhdrContainsScn(phdr, &shdr)) {
+ if (PHDR_CONTAINS_SCN_IN_MEMORY(phdr, &shdr)) {
printf(" %10u %s\n", elf_ndxscn(scn), elfu_eScnName(e, scn));
}