Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/sys Add more SHF_ and whitespace align SHT_



details:   https://anonhg.NetBSD.org/src/rev/4be452a3a227
branches:  trunk
changeset: 772882:4be452a3a227
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 19 21:35:11 2012 +0000

description:
Add more SHF_ and whitespace align SHT_

diffstat:

 sys/sys/exec_elf.h |  1040 ++++++++++++++++++++++++++-------------------------
 1 files changed, 525 insertions(+), 515 deletions(-)

diffs (truncated from 1377 to 300 lines):

diff -r bdf488ca1e7e -r 4be452a3a227 sys/sys/exec_elf.h
--- a/sys/sys/exec_elf.h        Thu Jan 19 21:25:13 2012 +0000
+++ b/sys/sys/exec_elf.h        Thu Jan 19 21:35:11 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec_elf.h,v 1.119 2012/01/19 21:25:13 christos Exp $  */
+/*     $NetBSD: exec_elf.h,v 1.120 2012/01/19 21:35:11 christos Exp $  */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #ifndef _SYS_EXEC_ELF_H_
-#define        _SYS_EXEC_ELF_H_
+#define _SYS_EXEC_ELF_H_
 
 /*
  * The current ELF ABI specification is available at:
@@ -55,45 +55,45 @@
 typedef uint8_t                Elf_Byte;
 
 typedef uint32_t       Elf32_Addr;
-#define        ELF32_FSZ_ADDR  4
+#define ELF32_FSZ_ADDR 4
 typedef uint32_t       Elf32_Off;
 typedef int32_t                Elf32_SOff;
-#define        ELF32_FSZ_OFF   4
+#define ELF32_FSZ_OFF  4
 typedef int32_t                Elf32_Sword;
-#define        ELF32_FSZ_SWORD 4
+#define ELF32_FSZ_SWORD 4
 typedef uint32_t       Elf32_Word;
-#define        ELF32_FSZ_WORD  4
+#define ELF32_FSZ_WORD 4
 typedef uint16_t       Elf32_Half;
-#define        ELF32_FSZ_HALF  2
+#define ELF32_FSZ_HALF 2
 typedef uint64_t       Elf32_Lword;
-#define        ELF32_FSZ_LWORD 8
+#define ELF32_FSZ_LWORD 8
 
 typedef uint64_t       Elf64_Addr;
-#define        ELF64_FSZ_ADDR  8
+#define ELF64_FSZ_ADDR 8
 typedef uint64_t       Elf64_Off;
 typedef int64_t                Elf64_SOff;
-#define        ELF64_FSZ_OFF   8
+#define ELF64_FSZ_OFF  8
 typedef int32_t                Elf64_Shalf;
-#define        ELF64_FSZ_SHALF 4
+#define ELF64_FSZ_SHALF 4
 
 typedef int32_t                Elf64_Sword;
-#define        ELF64_FSZ_SWORD 4
+#define ELF64_FSZ_SWORD 4
 typedef uint32_t       Elf64_Word;
-#define        ELF64_FSZ_WORD  4
+#define ELF64_FSZ_WORD 4
 
 typedef int64_t                Elf64_Sxword;
-#define        ELF64_FSZ_SXWORD 8
+#define ELF64_FSZ_SXWORD 8
 typedef uint64_t       Elf64_Xword;
-#define        ELF64_FSZ_XWORD 8
+#define ELF64_FSZ_XWORD 8
 typedef uint64_t       Elf64_Lword;
-#define        ELF64_FSZ_LWORD 8
+#define ELF64_FSZ_LWORD 8
 typedef uint16_t       Elf64_Half;
-#define        ELF64_FSZ_HALF 2
+#define ELF64_FSZ_HALF 2
 
 /*
  * ELF Header
  */
-#define        ELF_NIDENT      16
+#define ELF_NIDENT     16
 
 typedef struct {
        unsigned char   e_ident[ELF_NIDENT];    /* Id bytes */
@@ -130,182 +130,182 @@
 } Elf64_Ehdr;
 
 /* e_ident offsets */
-#define        EI_MAG0         0       /* '\177' */
-#define        EI_MAG1         1       /* 'E'    */
-#define        EI_MAG2         2       /* 'L'    */
-#define        EI_MAG3         3       /* 'F'    */
-#define        EI_CLASS        4       /* File class */
-#define        EI_DATA         5       /* Data encoding */
-#define        EI_VERSION      6       /* File version */
-#define        EI_OSABI        7       /* Operating system/ABI identification */
-#define        EI_ABIVERSION   8       /* ABI version */
-#define        EI_PAD          9       /* Start of padding bytes up to EI_NIDENT*/
-#define        EI_NIDENT       16      /* First non-ident header byte */
+#define EI_MAG0                0       /* '\177' */
+#define EI_MAG1                1       /* 'E'    */
+#define EI_MAG2                2       /* 'L'    */
+#define EI_MAG3                3       /* 'F'    */
+#define EI_CLASS       4       /* File class */
+#define EI_DATA                5       /* Data encoding */
+#define EI_VERSION     6       /* File version */
+#define EI_OSABI       7       /* Operating system/ABI identification */
+#define EI_ABIVERSION  8       /* ABI version */
+#define EI_PAD         9       /* Start of padding bytes up to EI_NIDENT*/
+#define EI_NIDENT      16      /* First non-ident header byte */
 
 /* e_ident[EI_MAG0,EI_MAG3] */
-#define        ELFMAG0         0x7f
-#define        ELFMAG1         'E'
-#define        ELFMAG2         'L'
-#define        ELFMAG3         'F'
-#define        ELFMAG          "\177ELF"
-#define        SELFMAG         4
+#define ELFMAG0                0x7f
+#define ELFMAG1                'E'
+#define ELFMAG2                'L'
+#define ELFMAG3                'F'
+#define ELFMAG         "\177ELF"
+#define SELFMAG                4
 
 /* e_ident[EI_CLASS] */
-#define        ELFCLASSNONE    0       /* Invalid class */
-#define        ELFCLASS32      1       /* 32-bit objects */
-#define        ELFCLASS64      2       /* 64-bit objects */
-#define        ELFCLASSNUM     3
+#define ELFCLASSNONE   0       /* Invalid class */
+#define ELFCLASS32     1       /* 32-bit objects */
+#define ELFCLASS64     2       /* 64-bit objects */
+#define ELFCLASSNUM    3
 
 /* e_ident[EI_DATA] */
-#define        ELFDATANONE     0       /* Invalid data encoding */
-#define        ELFDATA2LSB     1       /* 2's complement values, LSB first */
-#define        ELFDATA2MSB     2       /* 2's complement values, MSB first */
+#define ELFDATANONE    0       /* Invalid data encoding */
+#define ELFDATA2LSB    1       /* 2's complement values, LSB first */
+#define ELFDATA2MSB    2       /* 2's complement values, MSB first */
 
 /* e_ident[EI_VERSION] */
-#define        EV_NONE         0       /* Invalid version */
-#define        EV_CURRENT      1       /* Current version */
-#define        EV_NUM          2
+#define EV_NONE                0       /* Invalid version */
+#define EV_CURRENT     1       /* Current version */
+#define EV_NUM         2
 
 /* e_ident[EI_OSABI] */
-#define        ELFOSABI_SYSV           0       /* UNIX System V ABI */
-#define        ELFOSABI_HPUX           1       /* HP-UX operating system */
-#define        ELFOSABI_NETBSD         2       /* NetBSD */
-#define        ELFOSABI_LINUX          3       /* GNU/Linux */
-#define        ELFOSABI_HURD           4       /* GNU/Hurd */
-#define        ELFOSABI_86OPEN         5       /* 86Open */
-#define        ELFOSABI_SOLARIS        6       /* Solaris */
-#define        ELFOSABI_MONTEREY       7       /* Monterey */
-#define        ELFOSABI_IRIX           8       /* IRIX */
-#define        ELFOSABI_FREEBSD        9       /* FreeBSD */
-#define        ELFOSABI_TRU64          10      /* TRU64 UNIX */
-#define        ELFOSABI_MODESTO        11      /* Novell Modesto */
-#define        ELFOSABI_OPENBSD        12      /* OpenBSD */
-#define        ELFOSABI_OPENVMS        13      /* OpenVMS */
-#define        ELFOSABI_NSK            14      /* HP Non-Stop Kernel */
-#define        ELFOSABI_AROS           15      /* Amiga Research OS */
+#define ELFOSABI_SYSV          0       /* UNIX System V ABI */
+#define ELFOSABI_HPUX          1       /* HP-UX operating system */
+#define ELFOSABI_NETBSD                2       /* NetBSD */
+#define ELFOSABI_LINUX         3       /* GNU/Linux */
+#define ELFOSABI_HURD          4       /* GNU/Hurd */
+#define ELFOSABI_86OPEN                5       /* 86Open */
+#define ELFOSABI_SOLARIS       6       /* Solaris */
+#define ELFOSABI_MONTEREY      7       /* Monterey */
+#define ELFOSABI_IRIX          8       /* IRIX */
+#define ELFOSABI_FREEBSD       9       /* FreeBSD */
+#define ELFOSABI_TRU64         10      /* TRU64 UNIX */
+#define ELFOSABI_MODESTO       11      /* Novell Modesto */
+#define ELFOSABI_OPENBSD       12      /* OpenBSD */
+#define ELFOSABI_OPENVMS       13      /* OpenVMS */
+#define ELFOSABI_NSK           14      /* HP Non-Stop Kernel */
+#define ELFOSABI_AROS          15      /* Amiga Research OS */
 /* Unofficial OSABIs follow */
-#define        ELFOSABI_ARM            97      /* ARM */
-#define        ELFOSABI_STANDALONE     255     /* Standalone (embedded) application */
+#define ELFOSABI_ARM           97      /* ARM */
+#define ELFOSABI_STANDALONE    255     /* Standalone (embedded) application */
 
-#define        ELFOSABI_NONE           ELFOSABI_SYSV
-#define        ELFOSABI_AIX            ELFOSABI_MONTEREY
+#define ELFOSABI_NONE          ELFOSABI_SYSV
+#define ELFOSABI_AIX           ELFOSABI_MONTEREY
 
 /* e_type */
-#define        ET_NONE         0       /* No file type */
-#define        ET_REL          1       /* Relocatable file */
-#define        ET_EXEC         2       /* Executable file */
-#define        ET_DYN          3       /* Shared object file */
-#define        ET_CORE         4       /* Core file */
-#define        ET_NUM          5
+#define ET_NONE                0       /* No file type */
+#define ET_REL         1       /* Relocatable file */
+#define ET_EXEC                2       /* Executable file */
+#define ET_DYN         3       /* Shared object file */
+#define ET_CORE                4       /* Core file */
+#define ET_NUM         5
 
-#define        ET_LOOS         0xfe00  /* Operating system specific range */
-#define        ET_HIOS         0xfeff
-#define        ET_LOPROC       0xff00  /* Processor-specific range */
-#define        ET_HIPROC       0xffff
+#define ET_LOOS                0xfe00  /* Operating system specific range */
+#define ET_HIOS                0xfeff
+#define ET_LOPROC      0xff00  /* Processor-specific range */
+#define ET_HIPROC      0xffff
 
 /* e_machine */
-#define        EM_NONE         0       /* No machine */
-#define        EM_M32          1       /* AT&T WE 32100 */
-#define        EM_SPARC        2       /* SPARC */
-#define        EM_386          3       /* Intel 80386 */
-#define        EM_68K          4       /* Motorola 68000 */
-#define        EM_88K          5       /* Motorola 88000 */
-#define        EM_486          6       /* Intel 80486 */
-#define        EM_860          7       /* Intel 80860 */
-#define        EM_MIPS         8       /* MIPS I Architecture */
-#define        EM_S370         9       /* Amdahl UTS on System/370 */
-#define        EM_MIPS_RS3_LE  10      /* MIPS RS3000 Little-endian */
+#define EM_NONE                0       /* No machine */
+#define EM_M32         1       /* AT&T WE 32100 */
+#define EM_SPARC       2       /* SPARC */
+#define EM_386         3       /* Intel 80386 */
+#define EM_68K         4       /* Motorola 68000 */
+#define EM_88K         5       /* Motorola 88000 */
+#define EM_486         6       /* Intel 80486 */
+#define EM_860         7       /* Intel 80860 */
+#define EM_MIPS                8       /* MIPS I Architecture */
+#define EM_S370                9       /* Amdahl UTS on System/370 */
+#define EM_MIPS_RS3_LE 10      /* MIPS RS3000 Little-endian */
                        /* 11-14 - Reserved */
-#define        EM_RS6000       11      /* IBM RS/6000 XXX reserved */
-#define        EM_PARISC       15      /* Hewlett-Packard PA-RISC */
-#define        EM_NCUBE        16      /* NCube XXX reserved */
-#define        EM_VPP500       17      /* Fujitsu VPP500 */
-#define        EM_SPARC32PLUS  18      /* Enhanced instruction set SPARC */
-#define        EM_960          19      /* Intel 80960 */
-#define        EM_PPC          20      /* PowerPC */
-#define        EM_PPC64        21      /* 64-bit PowerPC */
+#define EM_RS6000      11      /* IBM RS/6000 XXX reserved */
+#define EM_PARISC      15      /* Hewlett-Packard PA-RISC */
+#define EM_NCUBE       16      /* NCube XXX reserved */
+#define EM_VPP500      17      /* Fujitsu VPP500 */
+#define EM_SPARC32PLUS 18      /* Enhanced instruction set SPARC */
+#define EM_960         19      /* Intel 80960 */
+#define EM_PPC         20      /* PowerPC */
+#define EM_PPC64       21      /* 64-bit PowerPC */
                        /* 22-35 - Reserved */
-#define        EM_S390         22      /* System/390 XXX reserved */
-#define        EM_V800         36      /* NEC V800 */
-#define        EM_FR20         37      /* Fujitsu FR20 */
-#define        EM_RH32         38      /* TRW RH-32 */
-#define        EM_RCE          39      /* Motorola RCE */
-#define        EM_ARM          40      /* Advanced RISC Machines ARM */
-#define        EM_ALPHA        41      /* DIGITAL Alpha */
-#define        EM_SH           42      /* Hitachi Super-H */
-#define        EM_SPARCV9      43      /* SPARC Version 9 */
-#define        EM_TRICORE      44      /* Siemens Tricore */
-#define        EM_ARC          45      /* Argonaut RISC Core */
-#define        EM_H8_300       46      /* Hitachi H8/300 */
-#define        EM_H8_300H      47      /* Hitachi H8/300H */
-#define        EM_H8S          48      /* Hitachi H8S */
-#define        EM_H8_500       49      /* Hitachi H8/500 */
-#define        EM_IA_64        50      /* Intel Merced Processor */
-#define        EM_MIPS_X       51      /* Stanford MIPS-X */
-#define        EM_COLDFIRE     52      /* Motorola Coldfire */
-#define        EM_68HC12       53      /* Motorola MC68HC12 */
-#define        EM_MMA          54      /* Fujitsu MMA Multimedia Accelerator */
-#define        EM_PCP          55      /* Siemens PCP */
-#define        EM_NCPU         56      /* Sony nCPU embedded RISC processor */
-#define        EM_NDR1         57      /* Denso NDR1 microprocessor */
-#define        EM_STARCORE     58      /* Motorola Star*Core processor */
-#define        EM_ME16         59      /* Toyota ME16 processor */
-#define        EM_ST100        60      /* STMicroelectronics ST100 processor */
-#define        EM_TINYJ        61      /* Advanced Logic Corp. TinyJ embedded family processor */
-#define        EM_X86_64       62      /* AMD x86-64 architecture */
-#define        EM_PDSP         63      /* Sony DSP Processor */
-#define        EM_PDP10        64      /* Digital Equipment Corp. PDP-10 */
-#define        EM_PDP11        65      /* Digital Equipment Corp. PDP-11 */
-#define        EM_FX66         66      /* Siemens FX66 microcontroller */
-#define        EM_ST9PLUS      67      /* STMicroelectronics ST9+ 8/16 bit microcontroller */
-#define        EM_ST7          68      /* STMicroelectronics ST7 8-bit microcontroller */
-#define        EM_68HC16       69      /* Motorola MC68HC16 Microcontroller */
-#define        EM_68HC11       70      /* Motorola MC68HC11 Microcontroller */
-#define        EM_68HC08       71      /* Motorola MC68HC08 Microcontroller */
-#define        EM_68HC05       72      /* Motorola MC68HC05 Microcontroller */
-#define        EM_SVX          73      /* Silicon Graphics SVx */
-#define        EM_ST19         74      /* STMicroelectronics ST19 8-bit CPU */
-#define        EM_VAX          75      /* Digital VAX */
-#define        EM_CRIS         76      /* Axis Communications 32-bit embedded processor */
-#define        EM_JAVELIN      77      /* Infineon Technologies 32-bit embedded CPU */
-#define        EM_FIREPATH     78      /* Element 14 64-bit DSP processor */
-#define        EM_ZSP          79      /* LSI Logic's 16-bit DSP processor */



Home | Main Index | Thread Index | Old Index