Mirror
/
upx
mirror of https://github.com/upx/upx.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

src: p_xxx_enum.h: trailing commas in enums are allowed since C++11

This commit is contained in:
Markus F.X.J. Oberhumer 2022-12-20 16:02:41 +01:00
parent 9b87ddb621
commit 708ab1dcd7
2 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/p_elf_enum.h
View File

@ -41,15 +41,15 @@
EI_DATA = 5, /* Data encoding */ EI_DATA = 5, /* Data encoding */
EI_VERSION = 6, EI_VERSION = 6,
EI_OSABI = 7, EI_OSABI = 7,
EI_ABIVERSION = 8 EI_ABIVERSION = 8,
}; };
enum { // e_ident[EI_CLASS] enum { // e_ident[EI_CLASS]
ELFCLASS32 = 1, /* 32-bit objects */ ELFCLASS32 = 1, /* 32-bit objects */
ELFCLASS64 = 2 /* 64-bit objects */ ELFCLASS64 = 2, /* 64-bit objects */
}; };
enum { // e_ident[EI_DATA] enum { // e_ident[EI_DATA]
ELFDATA2LSB = 1, /* 2's complement, little endian */ ELFDATA2LSB = 1, /* 2's complement, little endian */
ELFDATA2MSB = 2 /* 2's complement, big endian */ ELFDATA2MSB = 2, /* 2's complement, big endian */
}; };
enum { // e_ident[EI_OSABI] enum { // e_ident[EI_OSABI]
ELFOSABI_NONE = 0, // == ELFOSABI_SYSV ELFOSABI_NONE = 0, // == ELFOSABI_SYSV
@ -57,28 +57,28 @@
ELFOSABI_LINUX = 3, ELFOSABI_LINUX = 3,
ELFOSABI_FREEBSD = 9, ELFOSABI_FREEBSD = 9,
ELFOSABI_OPENBSD = 12, ELFOSABI_OPENBSD = 12,
ELFOSABI_ARM = 97 ELFOSABI_ARM = 97,
}; };
enum { // e_type enum { // e_type
ET_NONE = 0, /* No file type */ ET_NONE = 0, /* No file type */
ET_REL = 1, /* Relocatable file */ ET_REL = 1, /* Relocatable file */
ET_EXEC = 2, /* Executable file */ ET_EXEC = 2, /* Executable file */
ET_DYN = 3, /* Shared object file */ ET_DYN = 3, /* Shared object file */
ET_CORE = 4 /* Core file */ ET_CORE = 4, /* Core file */
}; };
enum { // e_machine enum { // e_machine
EM_386 = 3, EM_386 = 3,
EM_MIPS = 8, EM_MIPS = 8,
EM_MIPS_RS3_LE = 10, /* MIPS R3000 little-endian */ EM_MIPS_RS3_LE = 10, /* MIPS R3000 little-endian */
EM_PPC = 20, EM_PPC = 20,
EM_PPC64 = 21, EM_PPC64 = 21,
EM_ARM = 40, EM_ARM = 40,
EM_X86_64 = 62, EM_X86_64 = 62,
EM_AARCH64 = 183 EM_AARCH64 = 183,
}; };
enum { // e_version enum { // e_version
EV_CURRENT = 1 EV_CURRENT = 1,
}; };
#endif #endif
@ -91,16 +91,16 @@
PT_DYNAMIC = 2, /* Dynamic linking information */ PT_DYNAMIC = 2, /* Dynamic linking information */
PT_INTERP = 3, /* Name of program interpreter */ PT_INTERP = 3, /* Name of program interpreter */
PT_NOTE = 4, /* Auxiliary information (esp. OpenBSD) */ PT_NOTE = 4, /* Auxiliary information (esp. OpenBSD) */
PT_PHDR = 6 /* Entry for header table itself */ PT_PHDR = 6, /* Entry for header table itself */
, PT_NUM = 8 /* Number of defined types in low range */ PT_NUM = 8, /* Number of defined types in low range */
, PT_GNU_STACK = 0x6474e551 /* Indicates stack executability */ PT_GNU_STACK = 0x6474e551, /* Indicates stack executability */
, PT_GNU_RELRO = 0x6474e552 /* Read-only after relocation */ PT_GNU_RELRO = 0x6474e552, /* Read-only after relocation */
}; };
enum { // p_flags enum { // p_flags
PF_X = 1, /* Segment is executable */ PF_X = 1, /* Segment is executable */
PF_W = 2, /* Segment is writable */ PF_W = 2, /* Segment is writable */
PF_R = 4 /* Segment is readable */ PF_R = 4, /* Segment is readable */
}; };
#endif #endif
@ -126,12 +126,12 @@
SHT_PREINIT_ARRAY = 16, /* Array of pre-constructors */ SHT_PREINIT_ARRAY = 16, /* Array of pre-constructors */
SHT_GROUP = 17, /* Section group */ SHT_GROUP = 17, /* Section group */
SHT_SYMTAB_SHNDX = 18, /* Extended section indeces */ SHT_SYMTAB_SHNDX = 18, /* Extended section indeces */
SHT_GNU_LIBLIST = 0x6ffffff7 /* Prelink library list */ SHT_GNU_LIBLIST = 0x6ffffff7, /* Prelink library list */
, SHT_GNU_HASH = 0x6ffffff6 /* GNU-style hash table. */ SHT_GNU_HASH = 0x6ffffff6, /* GNU-style hash table. */
, SHT_LOOS = 0x60000000 /* LOcal OS; SHT_ANDROID_REL{,A} is +1, +2 */ SHT_LOOS = 0x60000000, /* LOcal OS; SHT_ANDROID_REL{,A} is +1, +2 */
, SHT_LOPROC = 0x70000000/* Start of processor-specific */ SHT_LOPROC = 0x70000000, /* Start of processor-specific */
, SHT_ARM_ATTRIBUTES = (SHT_LOPROC + 3) /* ARM attributes section. */ SHT_ARM_ATTRIBUTES = (SHT_LOPROC + 3), /* ARM attributes section. */
}; };
enum { // sh_flags enum { // sh_flags
@ -141,7 +141,7 @@
SHF_MERGE = (1 << 4), /* Might be merged */ SHF_MERGE = (1 << 4), /* Might be merged */
SHF_STRINGS = (1 << 5), /* Contains nul-terminated strings */ SHF_STRINGS = (1 << 5), /* Contains nul-terminated strings */
SHF_INFO_LINK = (1 << 6), /* 'sh_info' contains SHT index */ SHF_INFO_LINK = (1 << 6), /* 'sh_info' contains SHT index */
SHF_LINK_ORDER = (1 << 7) /* Preserve order after combining */ SHF_LINK_ORDER = (1 << 7), /* Preserve order after combining */
}; };
#endif #endif
@ -183,11 +183,11 @@
DT_VERSYM = 0x6ffffff0, /* version[] for each symbol */ DT_VERSYM = 0x6ffffff0, /* version[] for each symbol */
DT_FLAGS_1 = 0x6ffffffb, /* DF_1_* */ DT_FLAGS_1 = 0x6ffffffb, /* DF_1_* */
DT_VERDEF = 0x6ffffffc, /* version definitions[] */ DT_VERDEF = 0x6ffffffc, /* version definitions[] */
DT_VERNEED = 0x6ffffffe /* version[] needed */ DT_VERNEED = 0x6ffffffe, /* version[] needed */
}; };
enum { // DT_FLAGS_1 enum { // DT_FLAGS_1
DF_1_NOW = 0x00000001, /* Set RTLD_NOW for this object. */ DF_1_NOW = 0x00000001, /* Set RTLD_NOW for this object. */
DF_1_PIE = 0x08000000 // Position-Independent Executable (main program) DF_1_PIE = 0x08000000, // Position-Independent Executable (main program)
}; };
#endif #endif
@ -197,7 +197,7 @@
enum { // st_bind (high 4 bits of st_info) enum { // st_bind (high 4 bits of st_info)
STB_LOCAL = 0, /* Local symbol */ STB_LOCAL = 0, /* Local symbol */
STB_GLOBAL = 1, /* Global symbol */ STB_GLOBAL = 1, /* Global symbol */
STB_WEAK = 2 /* Weak symbol */ STB_WEAK = 2, /* Weak symbol */
}; };
enum { // st_type (low 4 bits of st_info) enum { // st_type (low 4 bits of st_info)
@ -207,20 +207,20 @@
STT_SECTION = 3, /* Symbol associated with a section */ STT_SECTION = 3, /* Symbol associated with a section */
STT_FILE = 4, /* Symbol's name is file name */ STT_FILE = 4, /* Symbol's name is file name */
STT_COMMON = 5, /* Symbol is a common data object */ STT_COMMON = 5, /* Symbol is a common data object */
STT_TLS = 6 /* Symbol is thread-local data object*/ STT_TLS = 6, /* Symbol is thread-local data object*/
}; };
enum { // st_other (visibility) enum { // st_other (visibility)
STV_DEFAULT = 0, /* Default symbol visibility rules */ STV_DEFAULT = 0, /* Default symbol visibility rules */
STV_INTERNAL = 1, /* Processor specific hidden class */ STV_INTERNAL = 1, /* Processor specific hidden class */
STV_HIDDEN = 2, /* Sym unavailable in other modules */ STV_HIDDEN = 2, /* Sym unavailable in other modules */
STV_PROTECTED= 3 /* Not preemptible, not exported */ STV_PROTECTED= 3, /* Not preemptible, not exported */
}; };
enum { // st_shndx enum { // st_shndx
SHN_UNDEF = 0, /* Undefined section */ SHN_UNDEF = 0, /* Undefined section */
SHN_ABS = 0xfff1, /* Associated symbol is absolute */ SHN_ABS = 0xfff1, /* Associated symbol is absolute */
SHN_COMMON = 0xfff2 /* Associated symbol is common */ SHN_COMMON = 0xfff2, /* Associated symbol is common */
}; };
#endif #endif
@ -247,13 +247,13 @@
R_ARM_JUMP_SLOT = 22, R_ARM_JUMP_SLOT = 22,
R_PPC_JMP_SLOT = 21, R_PPC_JMP_SLOT = 21,
R_PPC64_JMP_SLOT = R_PPC_JMP_SLOT, R_PPC64_JMP_SLOT = R_PPC_JMP_SLOT,
R_X86_64_JUMP_SLOT = 7 R_X86_64_JUMP_SLOT = 7,
, R_ARM_ABS32 = 2 R_ARM_ABS32 = 2,
, R_ARM_GLOB_DAT = 21 R_ARM_GLOB_DAT = 21,
, R_AARCH64_ABS64 = 257 R_AARCH64_ABS64 = 257,
, R_AARCH64_GLOB_DAT = 1025 R_AARCH64_GLOB_DAT = 1025,
}; };
#endif //} #endif //}
@ -272,7 +272,7 @@
#define ELF_NOTE_NETBSD_NAME "NetBSD\0" #define ELF_NOTE_NETBSD_NAME "NetBSD\0"
NHDR_NETBSD_TAG = 1, NHDR_NETBSD_TAG = 1,
NHDR_CHECKSUM_TAG = 2, NHDR_CHECKSUM_TAG = 2,
NHDR_PAX_TAG = 3 NHDR_PAX_TAG = 3,
}; };
enum { // descsz descriptor sizes enum { // descsz descriptor sizes
@ -280,20 +280,20 @@
NETBSD_DESCSZ = 4, // major_ver * (10**8) + minor NETBSD_DESCSZ = 4, // major_ver * (10**8) + minor
OPENBSD_DESCSZ = 4, // 32-bit zero OPENBSD_DESCSZ = 4, // 32-bit zero
// CHECKSUM_DESCSZ is 2*sizeof(short) + sizeof(checksum) // CHECKSUM_DESCSZ is 2*sizeof(short) + sizeof(checksum)
PAX_DESCSZ = 4 // 32-bit mask PAX_DESCSZ = 4, // 32-bit mask
}; };
enum { // GNU OS/version enum { // GNU OS/version
GNU_OS_LINUX = 0, GNU_OS_LINUX = 0,
GNU_OS_HURD = 1, GNU_OS_HURD = 1,
GNU_OS_SOLARIS = 2 GNU_OS_SOLARIS = 2,
}; };
enum { // NetBSD checksum methods enum { // NetBSD checksum methods
CHECKSUM_CRC32 = 1, CHECKSUM_CRC32 = 1,
CHECKSUM_MD5 = 2, CHECKSUM_MD5 = 2,
CHECKSUM_SHA1 = 3, CHECKSUM_SHA1 = 3,
CHECKSUM_SHA256 = 4 CHECKSUM_SHA256 = 4,
}; };
#define ELF_NOTE_PAX_NAME "PaX\0" #define ELF_NOTE_PAX_NAME "PaX\0"
@ -303,7 +303,7 @@
PAX_GUARD = (1<<2), /* force enable SEGVguard */ PAX_GUARD = (1<<2), /* force enable SEGVguard */
PAX_NOGUARD = (1<<3), /* force disable SEGVguard */ PAX_NOGUARD = (1<<3), /* force disable SEGVguard */
PAX_ASLR = (1<<4), /* force enable ASLR */ PAX_ASLR = (1<<4), /* force enable ASLR */
PAX_NOASLR = (1<<5) /* force disable ASLR */ PAX_NOASLR = (1<<5), /* force disable ASLR */
}; };
#endif #endif

17
src/p_mach_enum.h
View File

@ -36,7 +36,7 @@
#ifdef WANT_MACH_HEADER_ENUM /*{*/ #ifdef WANT_MACH_HEADER_ENUM /*{*/
#undef WANT_MACH_HEADER_ENUM #undef WANT_MACH_HEADER_ENUM
enum : unsigned { // magic enum : unsigned { // magic
MH_MAGIC = 0xfeedface MH_MAGIC = 0xfeedface,
}; };
enum { // cputype enum { // cputype
CPU_TYPE_I386 = 7, CPU_TYPE_I386 = 7,
@ -49,7 +49,7 @@
enum { // cpusubtype enum { // cpusubtype
CPU_SUBTYPE_ARM_ALL = 0, CPU_SUBTYPE_ARM_ALL = 0,
CPU_SUBTYPE_ARM_V4T = 5, CPU_SUBTYPE_ARM_V4T = 5,
CPU_SUBTYPE_ARM_V6 = 6 CPU_SUBTYPE_ARM_V6 = 6,
}; };
enum { // filetype enum { // filetype
MH_OBJECT = 1, /* relocatable object file */ MH_OBJECT = 1, /* relocatable object file */
@ -57,14 +57,14 @@
MH_PRELOAD = 5, /* preloaded executable */ MH_PRELOAD = 5, /* preloaded executable */
MH_DYLIB = 6, /* dynamically bound shared library */ MH_DYLIB = 6, /* dynamically bound shared library */
MH_DYLINKER= 7, /* /usr/bin/dyld */ MH_DYLINKER= 7, /* /usr/bin/dyld */
MH_BUNDLE = 8 /* dynamically bound bundle file */ MH_BUNDLE = 8, /* dynamically bound bundle file */
}; };
enum { // flags enum { // flags
MH_NOUNDEFS = 1, MH_NOUNDEFS = 1,
MH_DYLDLINK = 4, /* code signing demands this */ MH_DYLDLINK = 4, /* code signing demands this */
MH_BINDATLOAD = 0x8, // DT_BIND_NOW MH_BINDATLOAD = 0x8, // DT_BIND_NOW
MH_TWOLEVEL = 0x80, MH_TWOLEVEL = 0x80,
MH_PIE = 0x200000 // ASLR MH_PIE = 0x200000, // ASLR
}; };
#endif /*}*/ #endif /*}*/
@ -111,13 +111,12 @@
LC_DYLD_EXPORTS_TRIE = (0x33|LC_REQ_DYLD), // size 4*4 LC_DYLD_EXPORTS_TRIE = (0x33|LC_REQ_DYLD), // size 4*4
LC_DYLD_CHAINED_FIXUPS = (0x34|LC_REQ_DYLD), // size 4*4 LC_DYLD_CHAINED_FIXUPS = (0x34|LC_REQ_DYLD), // size 4*4
LC_FILESET_ENTRY = (0x35|LC_REQ_DYLD), // size 6*4 LC_FILESET_ENTRY = (0x35|LC_REQ_DYLD), // size 6*4
}; };
enum { // maxprot enum { // maxprot
VM_PROT_READ = 1, VM_PROT_READ = 1,
VM_PROT_WRITE = 2, VM_PROT_WRITE = 2,
VM_PROT_EXECUTE = 4 VM_PROT_EXECUTE = 4,
}; };
#endif /*}*/ #endif /*}*/
@ -151,7 +150,7 @@
S_ATTR_DEBUG = 0x02000000, S_ATTR_DEBUG = 0x02000000,
S_ATTR_SOME_INSTRUCTIONS = 0x00000400, S_ATTR_SOME_INSTRUCTIONS = 0x00000400,
S_ATTR_EXT_RELOC = 0x00000200, S_ATTR_EXT_RELOC = 0x00000200,
S_ATTR_LOC_RELOC = 0x00000100 S_ATTR_LOC_RELOC = 0x00000100,
}; };
#endif /*}*/ #endif /*}*/
@ -163,8 +162,8 @@
x86_THREAD_STATE32 = 1, x86_THREAD_STATE32 = 1,
x86_THREAD_STATE64 = 4, x86_THREAD_STATE64 = 4,
i386_OLD_THREAD_STATE = -1, i386_OLD_THREAD_STATE = -1,
ARM_THREAD_STATE = 1 ARM_THREAD_STATE = 1,
, ARM_THREAD_STATE64 = 6 // also ARM_THREAD_STATE64_COUNT 68 ARM_THREAD_STATE64 = 6, // also ARM_THREAD_STATE64_COUNT 68
}; };
#endif /*}*/ #endif /*}*/