Turn elfu_gPhdrContainsScn into a macro

[centaur.git] / include / libelfu / generic.h

diff --git a/include/libelfu/generic.h b/include/libelfu/generic.h
index 09d2ffc651f0d372815027c5d72896fae5068d6b..6a066348c637fe8586ad9e05ea9ba9e4f4fc8d7d 100644 (file)
--- a/include/libelfu/generic.h
+++ b/include/libelfu/generic.h
@@ -17,8 +17,17 @@
 
 
 
-int elfu_gPhdrContainsScn(GElf_Phdr *phdr, GElf_Shdr *shdr);
+#define SCNFILESIZE(shdr) ((shdr)->sh_type == SHT_NOBITS ? 0 : (shdr)->sh_size)
+
+
+
+#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))
 
-size_t elfu_gScnSizeFile(const GElf_Shdr *shdr);
 
 #endif