Changeset 666f492 in mainline for kernel/generic/include/lib/elf.h

Timestamp:

2010-05-24T18:42:44Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

da1bafb

Parents:

c555155

Message:

cstyle changes

File:

• kernel/generic/include/lib/elf.h (modified) (15 diffs)

kernel/generic/include/lib/elf.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -42 +42 @@
  * current ELF version
  */
-#define EV_CURRENT      1
+#define EV_CURRENT  1
 
 /**
  * ELF types
  */
-#define ET_NONE         0       /* No type */
-#define ET_REL          1       /* Relocatable file */
-#define ET_EXEC         2       /* Executable */
-#define ET_DYN          3       /* Shared object */
-#define ET_CORE         4       /* Core */
-#define ET_LOPROC       0xff00  /* Processor specific */
-#define ET_HIPROC       0xffff  /* Processor specific */
-
-/** 
+#define ET_NONE    0       /* No type */
+#define ET_REL     1       /* Relocatable file */
+#define ET_EXEC    2       /* Executable */
+#define ET_DYN     3       /* Shared object */
+#define ET_CORE    4       /* Core */
+#define ET_LOPROC  0xff00  /* Processor specific */
+#define ET_HIPROC  0xffff  /* Processor specific */
+
+/**
  * ELF machine types
  */
-#define EM_NO           0       /* No machine */
-#define EM_SPARC        2       /* SPARC */
-#define EM_386          3       /* i386 */
-#define EM_MIPS         8       /* MIPS RS3000 */
-#define EM_MIPS_RS3_LE  10      /* MIPS RS3000 LE */
-#define EM_PPC          20      /* PPC32 */
-#define EM_PPC64        21      /* PPC64 */
-#define EM_ARM          40      /* ARM */
-#define EM_SPARCV9      43      /* SPARC64 */
-#define EM_IA_64        50      /* IA-64 */
-#define EM_X86_64       62      /* AMD64/EMT64 */
+#define EM_NO           0   /* No machine */
+#define EM_SPARC        2   /* SPARC */
+#define EM_386          3   /* i386 */
+#define EM_MIPS         8   /* MIPS RS3000 */
+#define EM_MIPS_RS3_LE  10  /* MIPS RS3000 LE */
+#define EM_PPC          20  /* PPC32 */
+#define EM_PPC64        21  /* PPC64 */
+#define EM_ARM          40  /* ARM */
+#define EM_SPARCV9      43  /* SPARC64 */
+#define EM_IA_64        50  /* IA-64 */
+#define EM_X86_64       62  /* AMD64/EMT64 */
 
 /**
  * ELF identification indexes
  */
-#define EI_MAG0         0
-#define EI_MAG1         1
-#define EI_MAG2         2
-#define EI_MAG3         3
-#define EI_CLASS        4               /* File class */
-#define EI_DATA         5               /* Data encoding */
-#define EI_VERSION      6               /* File version */
-#define EI_OSABI        7
-#define EI_ABIVERSION   8
-#define EI_PAD          9               /* Start of padding bytes */
-#define EI_NIDENT       16              /* ELF identification table size */
+#define EI_MAG0        0
+#define EI_MAG1        1
+#define EI_MAG2        2
+#define EI_MAG3        3
+#define EI_CLASS       4   /* File class */
+#define EI_DATA        5   /* Data encoding */
+#define EI_VERSION     6   /* File version */
+#define EI_OSABI       7
+#define EI_ABIVERSION  8
+#define EI_PAD         9   /* Start of padding bytes */
+#define EI_NIDENT      16  /* ELF identification table size */
 
 /**
  * ELF magic number
  */
-#define ELFMAG0         0x7f
-#define ELFMAG1         'E'
-#define ELFMAG2         'L'
-#define ELFMAG3         'F'
+#define ELFMAG0  0x7f
+#define ELFMAG1  'E'
+#define ELFMAG2  'L'
+#define ELFMAG3  'F'
 
 /**
  * ELF file classes
  */
-#define ELFCLASSNONE    0
-#define ELFCLASS32      1
-#define ELFCLASS64      2
+#define ELFCLASSNONE  0
+#define ELFCLASS32    1
+#define ELFCLASS64    2
 
 /**
  * ELF data encoding types
  */
-#define ELFDATANONE     0
-#define ELFDATA2LSB     1               /* Least significant byte first (little endian) */
-#define ELFDATA2MSB     2               /* Most signigicant byte first (big endian) */
+#define ELFDATANONE  0
+#define ELFDATA2LSB  1  /* Least significant byte first (little endian) */
+#define ELFDATA2MSB  2  /* Most signigicant byte first (big endian) */
 
 /**
  * ELF error return codes
  */
-#define EE_OK                   0       /* No error */
-#define EE_INVALID              1       /* Invalid ELF image */
-#define EE_MEMORY               2       /* Cannot allocate address space */
-#define EE_INCOMPATIBLE         3       /* ELF image is not compatible with current architecture */
-#define EE_UNSUPPORTED          4       /* Non-supported ELF (e.g. dynamic ELFs) */
-#define EE_LOADER               5       /* The image is actually a program loader */
-#define EE_IRRECOVERABLE        6
+#define EE_OK             0  /* No error */
+#define EE_INVALID        1  /* Invalid ELF image */
+#define EE_MEMORY         2  /* Cannot allocate address space */
+#define EE_INCOMPATIBLE   3  /* ELF image is not compatible with current architecture */
+#define EE_UNSUPPORTED    4  /* Non-supported ELF (e.g. dynamic ELFs) */
+#define EE_LOADER         5  /* The image is actually a program loader */
+#define EE_IRRECOVERABLE  6
 
 /**
  * ELF section types
  */
-#define SHT_NULL                0
-#define SHT_PROGBITS            1
-#define SHT_SYMTAB              2
-#define SHT_STRTAB              3
-#define SHT_RELA                4
-#define SHT_HASH                5
-#define SHT_DYNAMIC             6
-#define SHT_NOTE                7
-#define SHT_NOBITS              8
-#define SHT_REL                 9
-#define SHT_SHLIB               10
-#define SHT_DYNSYM              11
-#define SHT_LOOS                0x60000000
-#define SHT_HIOS                0x6fffffff
-#define SHT_LOPROC              0x70000000
-#define SHT_HIPROC              0x7fffffff
-#define SHT_LOUSER              0x80000000
-#define SHT_HIUSER              0xffffffff
+#define SHT_NULL      0
+#define SHT_PROGBITS  1
+#define SHT_SYMTAB    2
+#define SHT_STRTAB    3
+#define SHT_RELA      4
+#define SHT_HASH      5
+#define SHT_DYNAMIC   6
+#define SHT_NOTE      7
+#define SHT_NOBITS    8
+#define SHT_REL       9
+#define SHT_SHLIB     10
+#define SHT_DYNSYM    11
+#define SHT_LOOS      0x60000000
+#define SHT_HIOS      0x6fffffff
+#define SHT_LOPROC    0x70000000
+#define SHT_HIPROC    0x7fffffff
+#define SHT_LOUSER    0x80000000
+#define SHT_HIUSER    0xffffffff
 
 /**
  * ELF section flags
  */
-#define SHF_WRITE               0x1 
-#define SHF_ALLOC               0x2
-#define SHF_EXECINSTR           0x4
-#define SHF_TLS                 0x400
-#define SHF_MASKPROC            0xf0000000
+#define SHF_WRITE      0x1
+#define SHF_ALLOC      0x2
+#define SHF_EXECINSTR  0x4
+#define SHF_TLS        0x400
+#define SHF_MASKPROC   0xf0000000
 
 /**
  * Symbol binding
  */
-#define STB_LOCAL               0
-#define STB_GLOBAL              1
-#define STB_WEAK                2
-#define STB_LOPROC              13
-#define STB_HIPROC              15
+#define STB_LOCAL   0
+#define STB_GLOBAL  1
+#define STB_WEAK    2
+#define STB_LOPROC  13
+#define STB_HIPROC  15
 
 /**
  * Symbol types
  */
-#define STT_NOTYPE              0
-#define STT_OBJECT              1
-#define STT_FUNC                2
-#define STT_SECTION             3
-#define STT_FILE                4
-#define STT_LOPROC              13
-#define STT_HIPROC              15
+#define STT_NOTYPE   0
+#define STT_OBJECT   1
+#define STT_FUNC     2
+#define STT_SECTION  3
+#define STT_FILE     4
+#define STT_LOPROC   13
+#define STT_HIPROC   15
 
 /**
  * Program segment types
  */
-#define PT_NULL                 0
-#define PT_LOAD                 1
-#define PT_DYNAMIC              2
-#define PT_INTERP               3
-#define PT_NOTE                 4
-#define PT_SHLIB                5
-#define PT_PHDR                 6
-#define PT_LOPROC               0x70000000
-#define PT_HIPROC               0x7fffffff
+#define PT_NULL     0
+#define PT_LOAD     1
+#define PT_DYNAMIC  2
+#define PT_INTERP   3
+#define PT_NOTE     4
+#define PT_SHLIB    5
+#define PT_PHDR     6
+#define PT_LOPROC   0x70000000
+#define PT_HIPROC   0x7fffffff
 
 /**
  * Program segment attributes.
  */
-#define PF_X    1
-#define PF_W    2
-#define PF_R    4
+#define PF_X  1
+#define PF_W  2
+#define PF_R  4
 
 /**
@@ -195 +195 @@
  * ELF object file specifications. They are the only types used
  * in ELF header.
+ *
  */
 typedef uint64_t elf_xword;
@@ -206 +207 @@
  *
  * These types are specific for 32-bit format.
+ *
  */
 typedef uint32_t elf32_addr;
@@ -214 +216 @@
  *
  * These types are specific for 64-bit format.
+ *
  */
 typedef uint64_t elf64_addr;
@@ -235 +238 @@
         elf_half e_shstrndx;
 };
+
 struct elf64_header {
         uint8_t e_ident[EI_NIDENT];
@@ -252 +256 @@
 };
 
-/*
+/**
  * ELF segment header.
  * Segments headers are also known as program headers.
@@ -266 +270 @@
         elf_word p_align;
 };
+
 struct elf64_segment_header {
         elf_word p_type;
@@ -277 +282 @@
 };
 
-/*
+/**
  * ELF section header
  */
@@ -292 +297 @@
         elf_word sh_entsize;
 };
+
 struct elf64_section_header {
         elf_word sh_name;
@@ -305 +311 @@
 };
 
-/*
+/**
  * ELF symbol table entry
  */
@@ -316 +322 @@
         elf_half st_shndx;
 };
+
 struct elf64_symbol {
         elf_word st_name;
@@ -325 +332 @@
 };
 
-#ifdef __32_BITS__ 
+#ifdef __32_BITS__
 typedef struct elf32_header elf_header_t;
 typedef struct elf32_segment_header elf_segment_header_t;
@@ -331 +338 @@
 typedef struct elf32_symbol elf_symbol_t;
 #endif
+
 #ifdef __64_BITS__
 typedef struct elf64_header elf_header_t;
@@ -340 +348 @@
 extern const char *elf_error(unsigned int rc);
 
-/* Interpreter string used to recognize the program loader */
-#define ELF_INTERP_ZSTR "kernel"
+/** Interpreter string used to recognize the program loader */
+#define ELF_INTERP_ZSTR  "kernel"
 #define ELF_INTERP_ZLEN  sizeof(ELF_INTERP_ZSTR)