Kernel/drvutil - Added 24bpp support

[tpg/acess2.git] / Usermode / Libraries / ld-acess.so_src / elf32.h

diff --git a/Usermode/Libraries/ld-acess.so_src/elf32.h b/Usermode/Libraries/ld-acess.so_src/elf32.h
index 983917b..be31517 100644 (file)
--- a/Usermode/Libraries/ld-acess.so_src/elf32.h
+++ b/Usermode/Libraries/ld-acess.so_src/elf32.h
@@ -6,15 +6,25 @@
 #ifndef _ELF32_H
 #define _ELF32_H
 
+#include <stdint.h>
+
+typedef uint32_t       Elf32_Addr;
+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   e_ident[16];    //!< Identifier Bytes
-       Uint16  filetype;       //!< File Type
+       uint8_t e_ident[16];    //!< Identifier Bytes
+       uint16_t        filetype;       //!< File Type
        Uint16  machine;        //!< Machine / Arch
        Uint32  version;        //!< Version (File?)
        Uint32  entrypoint;     //!< Entry Point
@@ -121,9 +131,9 @@ enum {
 
 struct sElf32_Phdr {
        Uint32  Type;
-       Uint    Offset;
-       Uint    VAddr;
-       Uint    PAddr;
+       Uint32  Offset;
+       Elf32_Addr      VAddr;
+       Elf32_Addr      PAddr;
        Uint32  FileSize;
        Uint32  MemSize;
        Uint32  Flags;
@@ -138,7 +148,7 @@ struct elf32_rel_s {
 struct elf32_rela_s {
        Uint32  r_offset;
        Uint32  r_info;
-       Sint32  r_addend;
+       Elf32_Sword     r_addend;
 };
 
 enum {
@@ -156,6 +166,37 @@ enum {
        R_386_LAST      // none
 };
 
+// NOTES:
+//  'T' means the thumb bit
+//  'B(S)' Origin of a symbol
+enum {
+       R_ARM_NONE,     // No action
+       R_ARM_PC24,     // ((S + A) | T) - P
+       R_ARM_ABS32,    // (S + A) | T
+       R_ARM_REL32,    // ((S + A) | T) - P
+       R_ARM_LDR_PC_G0,        // S + A - P
+       R_ARM_ABS16,    // S + A
+       R_ARM_ABS12,    // S + A
+       R_ARM_THM_ABS5, // S + A
+       R_ARM_ABS8,     // S + A
+       R_ARM_SBREL32,  // ((S + A) | T) - B(S)
+       R_ARM_THM_CALL, // ((S + A) | T) - P
+       R_ARM_THM_PC8,  // S + A - Pa,
+       R_ARM_BREL_ADJ, // ΔB(S) + A
+       R_ARM_TLS_DESC, // --
+       R_ARM_THM_SWI8, // (Reserved)
+       R_ARM_XPC25,    // (Reserved)
+       R_ARM_THM_XPC22,        // (Reserved)
+       R_ARM_TLS_DTPMOD32,     // Module[S]
+       R_ARM_TLS_DTPOFF32,     // S + A - TLS
+       R_ARM_TLS_TPOFF32,      // S + A - tp
+       R_ARM_COPY,     // Misc
+       R_ARM_GLOB_DAT, // (S + A) | T
+       R_ARM_JUMP_SLOT,        // (S + A) | T
+       R_ARM_RELATIVE, // 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