From b48fbf752002956d1311bf0e528038bcf3254cd4 Mon Sep 17 00:00:00 2001 From: xorstream Date: Sat, 23 Jan 2016 00:55:31 +1100 Subject: [PATCH] Sorted uc_modes by CPU and added masks --- include/unicorn/unicorn.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/unicorn/unicorn.h b/include/unicorn/unicorn.h index bc2e1d29..ab1e65bb 100644 --- a/include/unicorn/unicorn.h +++ b/include/unicorn/unicorn.h @@ -93,7 +93,7 @@ typedef enum uc_mode { UC_MODE_THUMB = 1 << 4, // ARM's Thumb mode, including Thumb-2 UC_MODE_MCLASS = 1 << 5, // ARM's Cortex-M series (currently unsupported) UC_MODE_V8 = 1 << 6, // ARMv8 A32 encodings for ARM (currently unsupported) - UC_MODE_ARM_MASK = UC_MODE_ARM|UC_MODE_THUMB|UC_MODE_MCLASS|UC_MODE_MCLASS|UC_MODE_LITTLE_ENDIAN|UC_MODE_BIG_ENDIAN, + UC_MODE_ARM_MASK = UC_MODE_ARM|UC_MODE_THUMB|UC_MODE_LITTLE_ENDIAN, // mips UC_MODE_MICRO = 1 << 4, // MicroMips mode UC_MODE_MIPS3 = 1 << 5, // Mips III ISA @@ -105,16 +105,16 @@ typedef enum uc_mode { UC_MODE_16 = 1 << 1, // 16-bit mode UC_MODE_32 = 1 << 2, // 32-bit mode UC_MODE_64 = 1 << 3, // 64-bit mode - UC_MODE_X86_MASK = UC_MODE_16|UC_MODE_32|UC_MODE_64|UC_MODE_LITTLE_ENDIAN|UC_MODE_BIG_ENDIAN, + UC_MODE_X86_MASK = UC_MODE_16|UC_MODE_32|UC_MODE_64|UC_MODE_LITTLE_ENDIAN, // ppc UC_MODE_PPC64 = 1 << 3, // 64-bit mode UC_MODE_QPX = 1 << 4, // Quad Processing eXtensions mode - UC_MODE_PPC_MASK = UC_MODE_PPC64|UC_MODE_QPX|UC_MODE_LITTLE_ENDIAN|UC_MODE_BIG_ENDIAN, + UC_MODE_PPC_MASK = UC_MODE_PPC64|UC_MODE_QPX|UC_MODE_LITTLE_ENDIAN, // sparc UC_MODE_V9 = 1 << 4, // SparcV9 mode - UC_MODE_SPARC_MASK = UC_MODE_V9|UC_MODE_LITTLE_ENDIAN|UC_MODE_BIG_ENDIAN, + UC_MODE_SPARC_MASK = UC_MODE_V9|UC_MODE_LITTLE_ENDIAN, // m68k - UC_MODE_M68K_MASK = UC_MODE_LITTLE_ENDIAN|UC_MODE_BIG_ENDIAN, + UC_MODE_M68K_MASK = UC_MODE_LITTLE_ENDIAN, } uc_mode; // All type of errors encountered by Unicorn API.