Changeset ca0e838 in mainline for abi/include/abi/elf.h

Timestamp:

2019-02-23T17:52:16Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

52b44c6

Parents:

ab87db5

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-11 15:28:25)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-23 17:52:16)

Message:

Convert preprocessor macros in abi/ to C constructs

Preprocessor macros are an obsolete concept and they complicate things.
They are also completely unnecessary in most circumstances.

This commit changes untyped numeric constants into anonymous enums,
typed constants into static const variables, and function-like macros
into functions.

File:

• abi/include/abi/elf.h (modified) (1 diff)

abi/include/abi/elf.h

@@ -42 +42 @@
  * Current ELF version
  */
-#define EV_CURRENT  1
+enum {
+        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 */
+enum elf_type {
+        ET_NONE   = 0,       /* No type */
+        ET_REL    = 1,       /* Relocatable file */
+        ET_EXEC   = 2,       /* Executable */
+        ET_DYN    = 3,       /* Shared object */
+        ET_CORE   = 4,       /* Core */
+};
+
+enum {
+        ET_LOPROC = 0xff00,  /* Lowest processor specific */
+        ET_HIPROC = 0xffff,  /* Highest 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_RISCV        243  /* RISC-V */
+enum elf_machine {
+        EM_NO          = 0,    /* No machine */
+        EM_SPARC       = 2,    /* SPARC */
+        EM_386         = 3,    /* i386 */
+        EM_MIPS        = 8,    /* MIPS RS3000 */
+        EM_MIPS_RS3_LE = 10,   /* MIPS RS3000 LE */
+        EM_PPC         = 20,   /* PPC32 */
+        EM_PPC64       = 21,   /* PPC64 */
+        EM_ARM         = 40,   /* ARM */
+        EM_SPARCV9     = 43,   /* SPARC64 */
+        EM_IA_64       = 50,   /* IA-64 */
+        EM_X86_64      = 62,   /* AMD64/EMT64 */
+        EM_RISCV       = 243,  /* RISC-V */
+};
 
 /**
  * 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 */
+enum {
+        EI_MAG0       = 0,
+        EI_MAG1       = 1,
+        EI_MAG2       = 2,
+        EI_MAG3       = 3,
+        EI_CLASS      = 4,   /* File class */
+        EI_DATA       = 5,   /* Data encoding */
+        EI_VERSION    = 6,   /* File version */
+        EI_OSABI      = 7,
+        EI_ABIVERSION = 8,
+        EI_PAD        = 9,   /* Start of padding bytes */
+        EI_NIDENT     = 16,  /* ELF identification table size */
+};
 
 /**
  * ELF magic number
  */
-#define ELFMAG0  0x7f
-#define ELFMAG1  'E'
-#define ELFMAG2  'L'
-#define ELFMAG3  'F'
+enum {
+        ELFMAG0 = 0x7f,
+        ELFMAG1 = 'E',
+        ELFMAG2 = 'L',
+        ELFMAG3 = 'F',
+};
 
 /**
  * ELF file classes
  */
-#define ELFCLASSNONE  0
-#define ELFCLASS32    1
-#define ELFCLASS64    2
+enum elf_class {
+        ELFCLASSNONE = 0,
+        ELFCLASS32   = 1,
+        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) */
+enum elf_data_encoding {
+        ELFDATANONE = 0,
+        ELFDATA2LSB = 1,  /* Least significant byte first (little endian) */
+        ELFDATA2MSB = 2,  /* Most signigicant byte first (big endian) */
+};
 
 /**
  * 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
+enum elf_section_type {
+        SHT_NULL     = 0,
+        SHT_PROGBITS = 1,
+        SHT_SYMTAB   = 2,
+        SHT_STRTAB   = 3,
+        SHT_RELA     = 4,
+        SHT_HASH     = 5,
+        SHT_DYNAMIC  = 6,
+        SHT_NOTE     = 7,
+        SHT_NOBITS   = 8,
+        SHT_REL      = 9,
+        SHT_SHLIB    = 10,
+        SHT_DYNSYM   = 11,
+};
+
+enum {
+        SHT_LOOS     = 0x60000000,
+        SHT_HIOS     = 0x6fffffff,
+        SHT_LOPROC   = 0x70000000,
+        SHT_HIPROC   = 0x7fffffff,
+        SHT_LOUSER   = 0x80000000,
+        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
-
-/** Macros for decomposing elf_symbol.st_info into binging and type */
-#define ELF_ST_BIND(i)     ((i) >> 4)
-#define ELF_ST_TYPE(i)     ((i) & 0x0f)
-#define ELF_ST_INFO(b, t)  (((b) << 4) + ((t) & 0x0f))
+enum {
+        SHF_WRITE     = 0x1,
+        SHF_ALLOC     = 0x2,
+        SHF_EXECINSTR = 0x4,
+        SHF_TLS       = 0x400,
+        SHF_MASKPROC  = 0xf0000000,
+};
+
+/** Functions for decomposing elf_symbol.st_info into binding and type */
+static inline uint8_t elf_st_bind(uint8_t info)
+{
+        return info >> 4;
+}
+
+static inline uint8_t elf_st_type(uint8_t info)
+{
+        return info & 0x0f;
+}
+
+static inline uint8_t elf_st_info(uint8_t bind, uint8_t type)
+{
+        return (bind << 4) | (type & 0x0f);
+}
 
 /**
  * Symbol binding
  */
-#define STB_LOCAL   0
-#define STB_GLOBAL  1
-#define STB_WEAK    2
-#define STB_LOPROC  13
-#define STB_HIPROC  15
+enum elf_symbol_binding {
+        STB_LOCAL  = 0,
+        STB_GLOBAL = 1,
+        STB_WEAK   = 2,
+};
+
+enum {
+        STB_LOPROC = 13,
+        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_TLS      6
-#define STT_LOPROC   13
-#define STT_HIPROC   15
+enum elf_symbol_type {
+        STT_NOTYPE  = 0,
+        STT_OBJECT  = 1,
+        STT_FUNC    = 2,
+        STT_SECTION = 3,
+        STT_FILE    = 4,
+        STT_TLS     = 6,
+};
+
+enum {
+        STT_LOPROC  = 13,
+        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_TLS           7
-#define PT_LOOS          0x60000000
-#define PT_GNU_EH_FRAME  0x6474e550
-#define PT_GNU_STACK     0x6474e551
-#define PT_GNU_RELRO     0x6474e552
-#define PT_HIOS          0x6fffffff
-#define PT_LOPROC        0x70000000
-#define PT_HIPROC        0x7fffffff
+enum elf_segment_type {
+        PT_NULL         = 0,
+        PT_LOAD         = 1,
+        PT_DYNAMIC      = 2,
+        PT_INTERP       = 3,
+        PT_NOTE         = 4,
+        PT_SHLIB        = 5,
+        PT_PHDR         = 6,
+        PT_TLS          = 7,
+
+        PT_GNU_EH_FRAME = 0x6474e550,
+        PT_GNU_STACK    = 0x6474e551,
+        PT_GNU_RELRO    = 0x6474e552,
+};
+
+enum {
+        PT_LOOS   = 0x60000000,
+        PT_HIOS   = 0x6fffffff,
+        PT_LOPROC = 0x70000000,
+        PT_HIPROC = 0x7fffffff,
+};
 
 /**
  * Program segment attributes.
  */
-#define PF_X  1
-#define PF_W  2
-#define PF_R  4
+enum elf_segment_access {
+        PF_X = 1,
+        PF_W = 2,
+        PF_R = 4,
+};
 
 /**