X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Felf32.h;h=3018a895adea0c67e23e6878ebf0b273f3c10d11;hb=6d32a3c22e659994d7ae6164ba3722ab12d11421;hp=580bbb4ae5e6bf83cec46681f2749a21a9ae0acd;hpb=c43c05ef3234d6118ce601d299df60383d54ac7b;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/ld-acess.so_src/elf32.h b/Usermode/Libraries/ld-acess.so_src/elf32.h
index 580bbb4a..3018a895 100644
--- a/Usermode/Libraries/ld-acess.so_src/elf32.h
+++ b/Usermode/Libraries/ld-acess.so_src/elf32.h
@@ -8,31 +8,37 @@
 
 #include <stdint.h>
 
+typedef uint16_t	Elf32_Half;
 typedef uint32_t	Elf32_Addr;
+typedef uint32_t	Elf32_Off;
 typedef uint32_t	Elf32_Word;
 typedef int32_t 	Elf32_Sword;
 
 #define ELFCLASS32	1
 
+#define EM_NONE	0
+#define EM_386	3
+#define EM_ARM	40
+
 /**
  \struct elf_header_s
  \brief ELF File Header
 */
 struct sElf32_Ehdr {
 	uint8_t	e_ident[16];	//!< Identifier Bytes
-	uint16_t	filetype;	//!< File Type
-	Uint16	machine;	//!< Machine / Arch
-	Uint32	version;	//!< Version (File?)
-	Uint32	entrypoint;	//!< Entry Point
-	Uint32	phoff;	//!< Program Header Offset
-	Uint32	shoff;	//!< Section Header Offset
-	Uint32	flags;	//!< Flags
-	Uint16	headersize;	//!< Header Size
-	Uint16	phentsize;	//!< Program Header Entry Size
-	Uint16	phentcount;	//!< Program Header Entry Count
-	Uint16	shentsize;	//!< Section Header Entry Size
-	Uint16	shentcount;	//!< Section Header Entry Count
-	Uint16	shstrindex;	//!< Section Header String Table Index
+	Elf32_Half	filetype;	//!< File Type
+	Elf32_Half	machine;	//!< Machine / Arch
+	Elf32_Word	version;	//!< Version (File?)
+	Elf32_Addr	entrypoint;	//!< Entry Point
+	Elf32_Off	phoff;	//!< Program Header Offset
+	Elf32_Word	shoff;	//!< Section Header Offset
+	Elf32_Word	flags;	//!< Flags
+	Elf32_Half	headersize;	//!< Header Size
+	Elf32_Half	phentsize;	//!< Program Header Entry Size
+	Elf32_Half	phentcount;	//!< Program Header Entry Count
+	Elf32_Half	shentsize;	//!< Section Header Entry Size
+	Elf32_Half	shentcount;	//!< Section Header Entry Count
+	Elf32_Half	shstrindex;	//!< Section Header String Table Index
 };
 
 /**
@@ -85,6 +91,7 @@ enum eElfSectionTypes {
 	SHT_HIUSER = 0xffffffff
 };
 
+#if 0
 #define SHF_WRITE	0x1
 #define SHF_ALLOC	0x2
 #define SHF_EXECINSTR	0x4
@@ -102,14 +109,15 @@ struct sElf32_Shent {
 	Uint32	addralign;
 	Uint32	entsize;
 };	//sizeof = 40
+#endif
 
 struct elf_sym_s {
-	Uint32	nameOfs;
-	Uint32	value;	//Address
-	Uint32	size;
-	Uint8	info;
-	Uint8	other;
-	Uint16	shndx;
+	Elf32_Word	nameOfs;
+	Elf32_Addr	value;	//Address
+	Elf32_Word	size;
+	uint8_t	info;
+	uint8_t	other;
+	Elf32_Half	shndx;
 };
 #define	STN_UNDEF	0	// Undefined Symbol
 
@@ -126,24 +134,24 @@ enum {
 };
 
 struct sElf32_Phdr {
-	Uint32	Type;
-	Uint32	Offset;
+	Elf32_Word	Type;
+	Elf32_Off	Offset;
 	Elf32_Addr	VAddr;
 	Elf32_Addr	PAddr;
-	Uint32	FileSize;
-	Uint32	MemSize;
-	Uint32	Flags;
-	Uint32	Align;
+	Elf32_Word	FileSize;
+	Elf32_Word	MemSize;
+	Elf32_Word	Flags;
+	Elf32_Word	Align;
 };
 
 struct elf32_rel_s {
-	Uint32	r_offset;
-	Uint32	r_info;
+	Elf32_Addr	r_offset;
+	Elf32_Word	r_info;
 };
 
 struct elf32_rela_s {
-	Uint32	r_offset;
-	Uint32	r_info;
+	Elf32_Addr	r_offset;
+	Elf32_Word	r_info;
 	Elf32_Sword	r_addend;
 };
 
@@ -162,13 +170,44 @@ enum {
 	R_386_LAST	// none
 };
 
+// NOTES:
+//  'T' means the thumb bit
+//  'B(S)' Origin of a symbol
+enum {
+	R_ARM_NONE,	//  0 No action
+	R_ARM_PC24,	//  1 ((S + A) | T) - P
+	R_ARM_ABS32,	//  2 (S + A) | T
+	R_ARM_REL32,	//  3 ((S + A) | T) - P
+	R_ARM_LDR_PC_G0,	//  4 S + A - P
+	R_ARM_ABS16,	//  5 S + A
+	R_ARM_ABS12,	//  6 S + A
+	R_ARM_THM_ABS5,	//  7 S + A
+	R_ARM_ABS8,	//  8 S + A
+	R_ARM_SBREL32,	//  9 ((S + A) | T) - B(S)
+	R_ARM_THM_CALL,	// 10 ((S + A) | T) - P
+	R_ARM_THM_PC8,	// 11 S + A - Pa,
+	R_ARM_BREL_ADJ,	// 12 ΔB(S) + A
+	R_ARM_TLS_DESC,	// 13 --
+	R_ARM_THM_SWI8,	// 14 (Reserved)
+	R_ARM_XPC25,	// 15 (Reserved)
+	R_ARM_THM_XPC22,	// 16 (Reserved)
+	R_ARM_TLS_DTPMOD32,	// 17 Module[S]
+	R_ARM_TLS_DTPOFF32,	// 18 S + A - TLS
+	R_ARM_TLS_TPOFF32,	// 19 S + A - tp
+	R_ARM_COPY,	// 20 Misc
+	R_ARM_GLOB_DAT,	// 21 (S + A) | T
+	R_ARM_JUMP_SLOT,	// 22 (S + A) | T
+	R_ARM_RELATIVE,	// 23 B(S) + A (extra?)
+	// ... More defined (IHI0044)
+};
+
 #define	ELF32_R_SYM(i)	((i)>>8)	// Takes an info value and returns a symbol index
 #define	ELF32_R_TYPE(i)	((i)&0xFF)	// Takes an info value and returns a type
 #define	ELF32_R_INFO(s,t)	(((s)<<8)+((t)&0xFF))	// Takes a type and symbol index and returns an info value
 
 struct elf32_dyn_s {
-	Uint16	d_tag;
-	Uint32	d_val;	//Also d_ptr
+	Elf32_Half	d_tag;
+	Elf32_Word	d_val;	//Also d_ptr
 };
 
 enum {