Cleaned up the ELF header a lot, added missing definitions.

Added some C++ only accessor methods for convenience.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5042 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/kernel/elf32.h

@@ -5,33 +5,26 @@
 #ifndef _ELF32_H
 #define _ELF32_H
 
-#include <ktypes.h>
+
+#include <SupportDefs.h>
+#include <ByteOrder.h>
+
 #include <arch/elf.h>
 
+
 typedef uint32 Elf32_Addr;
 typedef uint16 Elf32_Half;
 typedef uint32 Elf32_Off;
 typedef int32 Elf32_Sword;
 typedef uint32 Elf32_Word;
 
-#define ELF_MAGIC "\x7f""ELF"
+
-#define EI_MAG0	0
+/*** ELF header ***/
-#define EI_MAG1 1
+
-#define EI_MAG2 2
-#define EI_MAG3 3
-#define EI_CLASS 4
-#define EI_DATA 5
-#define EI_VERSION 6
-#define EI_PAD 7
 #define EI_NIDENT	16
 
-#define ELFCLASS32 1
-#define ELFCLASS64 2
-#define ELFDATA2LSB 1
-#define ELFDATA2MSB 2
-
 struct Elf32_Ehdr {
-	unsigned char	e_ident[EI_NIDENT];
+	uint8		e_ident[EI_NIDENT];
 	Elf32_Half	e_type;
 	Elf32_Half	e_machine;
 	Elf32_Word	e_version;
@@ -45,7 +38,33 @@ struct Elf32_Ehdr {
 	Elf32_Half	e_shentsize;
 	Elf32_Half	e_shnum;
 	Elf32_Half	e_shstrndx;
-} ;
+
+#ifdef __cplusplus
+	bool IsHostEndian() const;
+#endif
+};
+
+#define ELF_MAGIC	"\x7f""ELF"
+
+// e_ident[] indices
+#define EI_MAG0		0
+#define EI_MAG1		1
+#define EI_MAG2		2
+#define EI_MAG3		3
+#define EI_CLASS	4
+#define EI_DATA		5
+#define EI_VERSION	6
+#define EI_PAD		7
+
+// architecture class (EI_CLASS)
+#define ELFCLASS32	1
+#define ELFCLASS64	2
+// endian (EI_DATA)
+#define ELFDATA2LSB	1	// little endian
+#define ELFDATA2MSB	2	// big endian
+
+
+/*** section header ***/
 
 struct Elf32_Shdr {
 	Elf32_Word	sh_name;
@@ -58,8 +77,18 @@ struct Elf32_Shdr {
 	Elf32_Word	sh_info;
 	Elf32_Word	sh_addralign;
 	Elf32_Word	sh_entsize;
-} ;
+};
 
+// special section indices
+#define SHN_UNDEF		0
+#define SHN_LORESERVE	0xff00
+#define SHN_LOPROC		0xff00
+#define SHN_HIPROC		0xff1f
+#define SHN_ABS			0xfff1
+#define SHN_COMMON		0xfff2
+#define SHN_HIRESERVE	0xffff
+
+// section header type
 #define SHT_NULL		0
 #define SHT_PROGBITS	1
 #define SHT_SYMTAB		2
@@ -72,12 +101,21 @@ struct Elf32_Shdr {
 #define SHT_REL			9
 #define SHT_SHLIB		10
 #define SHT_DYNSYM		11
+
 #define SHT_LOPROC		0x70000000
 #define SHT_HIPROC		0x7fffffff
 #define SHT_LOUSER		0x80000000
 #define SHT_HIUSER		0xffffffff
 
+// section header flags
 #define SHF_WRITE		1
+#define SHF_ALLOC		2
+#define SHF_EXECINSTR	4
+
+#define SHF_MASKPROC	0xf0000000
+
+
+/*** program header ***/
 
 struct Elf32_Phdr {
 	Elf32_Word	p_type;
@@ -88,14 +126,14 @@ struct Elf32_Phdr {
 	Elf32_Word	p_memsz;	/* the size of the segment in memory */
 	Elf32_Word	p_flags;
 	Elf32_Word	p_align;
-} ;
-
-#define PF_X		0x1
-#define PF_W		0x2
-#define PF_R		0x4
-#define PF_MASKPROC	0xf0000000
 
+#ifdef __cplusplus
+	bool IsReadWrite() const;
+	bool IsExecutable() const;
+#endif
+};
 
+// program header segment types
 #define PT_NULL		0
 #define PT_LOAD		1
 #define PT_DYNAMIC	2
@@ -103,24 +141,30 @@ struct Elf32_Phdr {
 #define PT_NOTE		4
 #define PT_SHLIB	5
 #define PT_PHDR		6
+
 #define PT_LOPROC	0x70000000
 #define PT_HIPROC	0x7fffffff
 
-#define SHN_UNDEF 0
+// program header segment flags
-#define SHN_LORESERVE 0xff00
+#define PF_EXECUTE	0x1
-#define SHN_LOPROC 0xff00
+#define PF_WRITE	0x2
-#define SHN_HIPROC 0xff1f
+#define PF_READ		0x4
-#define SHN_ABS 0xfff1
+#define PF_PROTECTION_MASK (PF_EXECUTE | PF_WRITE | PF_READ)
-#define SHN_COMMON 0xfff2
+
-#define SHN_HIRESERVE 0xffff
+#define PF_MASKPROC	0xf0000000
 
 struct Elf32_Sym {
 	Elf32_Word	st_name;
 	Elf32_Addr	st_value;
 	Elf32_Word	st_size;
-	unsigned char	st_info;
+	uint8		st_info;
-	unsigned char 	st_other;
+	uint8 		st_other;
 	Elf32_Half	st_shndx;
+
+#ifdef __cplusplus
+	uint8 Bind() const;
+	uint8 Type() const;
+#endif
 };
 
 #define ELF32_ST_BIND(i) ((i) >> 4)
@@ -146,11 +190,20 @@ struct Elf32_Sym {
 struct Elf32_Rel {
 	Elf32_Addr r_offset;
 	Elf32_Word r_info;
+
+#ifdef __cplusplus
+	uint8 SymbolIndex() const;
+	uint8 Type() const;
+#endif
 };
 
+#ifdef __cplusplus
+struct Elf32_Rela : public Elf32_Rel {
+#else
 struct Elf32_Rela {
 	Elf32_Addr r_offset;
 	Elf32_Word r_info;
+#endif
 	Elf32_Sword r_addend;
 };
 
@@ -190,7 +243,67 @@ struct Elf32_Dyn {
 #define DT_DEBUG	21
 #define DT_TEXTREL	22
 #define DT_JMPREL	23
+
 #define DT_LOPROC	0x70000000
 #define DT_HIPROC	0x7fffffff
 
+
+/*** inline functions ***/
+
+#ifdef __cplusplus
+
+inline bool 
+Elf32_Ehdr::IsHostEndian() const
+{
+#if B_HOST_IS_LENDIAN
+	return e_ident[EI_DATA] == ELFDATA2LSB;
+#elif B_HOST_IS_BENDIAN
+	return e_ident[EI_DATA] == ELFDATA2MSB;
 #endif
+}
+
+
+inline bool 
+Elf32_Phdr::IsReadWrite() const
+{
+	return (p_flags & PF_PROTECTION_MASK) == (PF_READ | PF_WRITE);
+}
+
+
+inline bool
+Elf32_Phdr::IsExecutable() const
+{
+	return (p_flags & PF_PROTECTION_MASK) == (PF_READ | PF_EXECUTE);
+}
+
+
+inline uint8 
+Elf32_Sym::Bind() const
+{
+	return ELF32_ST_BIND(st_info);
+}
+
+
+inline uint8 
+Elf32_Sym::Type() const
+{
+	return ELF32_ST_TYPE(st_info);
+}
+
+
+inline uint8 
+Elf32_Rel::SymbolIndex() const
+{
+	return ELF32_R_SYM(r_info);
+}
+
+
+inline uint8 
+Elf32_Rel::Type() const
+{
+	return ELF32_R_TYPE(r_info);
+}
+
+#endif	/* __cplusplus */
+
+#endif	/* _ELF32_H_ */