diff --git a/CMakeLists.txt b/CMakeLists.txt index add77e5d4..4ef5f1e95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 2.6) project(capstone) -set(VERSION_MAJOR 4) -set(VERSION_MINOR 1) +set(VERSION_MAJOR 5) +set(VERSION_MINOR 0) set(VERSION_PATCH 0) if(POLICY CMP0042) diff --git a/bindings/python/capstone/__init__.py b/bindings/python/capstone/__init__.py index 8c5716b2f..3e86d1b5c 100644 --- a/bindings/python/capstone/__init__.py +++ b/bindings/python/capstone/__init__.py @@ -129,8 +129,8 @@ __all__ = [ # Capstone C interface # API version -CS_API_MAJOR = 4 -CS_API_MINOR = 1 +CS_API_MAJOR = 5 +CS_API_MINOR = 0 # Package version CS_VERSION_MAJOR = CS_API_MAJOR diff --git a/cstool/cstool.c b/cstool/cstool.c index 5986ef325..3fb54a0d9 100644 --- a/cstool/cstool.c +++ b/cstool/cstool.c @@ -139,79 +139,79 @@ static void usage(char *prog) printf("\nThe following options are supported:\n"); if (cs_support(CS_ARCH_X86)) { - printf(" x16: 16-bit mode (X86)\n"); - printf(" x32: 32-bit mode (X86)\n"); - printf(" x64: 64-bit mode (X86)\n"); - printf(" x16att: 16-bit mode (X86) syntax-att\n"); - printf(" x32att: 32-bit mode (X86) syntax-att\n"); - printf(" x64att: 64-bit mode (X86) syntax-att\n"); + printf(" x16 16-bit mode (X86)\n"); + printf(" x32 32-bit mode (X86)\n"); + printf(" x64 64-bit mode (X86)\n"); + printf(" x16att 16-bit mode (X86), syntax AT&T\n"); + printf(" x32att 32-bit mode (X86), syntax AT&T\n"); + printf(" x64att 64-bit mode (X86), syntax AT&T\n"); } if (cs_support(CS_ARCH_ARM)) { - printf(" arm: arm\n"); - printf(" armbe: arm + big endian\n"); - printf(" thumb: thumb mode\n"); - printf(" thumbbe: thumb + big endian\n"); - printf(" cortexm: thumb + cortex-m extensions\n"); + printf(" arm arm\n"); + printf(" armbe arm + big endian\n"); + printf(" thumb thumb mode\n"); + printf(" thumbbe thumb + big endian\n"); + printf(" cortexm thumb + cortex-m extensions\n"); } if (cs_support(CS_ARCH_ARM64)) { - printf(" arm64: aarch64 mode\n"); - printf(" arm64be: aarch64 + big endian\n"); + printf(" arm64 aarch64 mode\n"); + printf(" arm64be aarch64 + big endian\n"); } if (cs_support(CS_ARCH_MIPS)) { - printf(" mips: mips32 + little endian\n"); - printf(" mipsbe: mips32 + big endian\n"); - printf(" mips64: mips64 + little endian\n"); - printf(" mips64be: mips64 + big endian\n"); + printf(" mips mips32 + little endian\n"); + printf(" mipsbe mips32 + big endian\n"); + printf(" mips64 mips64 + little endian\n"); + printf(" mips64be mips64 + big endian\n"); } if (cs_support(CS_ARCH_PPC)) { - printf(" ppc64: ppc64 + little endian\n"); - printf(" ppc64be: ppc64 + big endian\n"); + printf(" ppc64 ppc64 + little endian\n"); + printf(" ppc64be ppc64 + big endian\n"); } if (cs_support(CS_ARCH_SPARC)) { - printf(" sparc: sparc\n"); + printf(" sparc sparc\n"); } if (cs_support(CS_ARCH_SYSZ)) { - printf(" systemz: systemz (s390x)\n"); + printf(" systemz systemz (s390x)\n"); } if (cs_support(CS_ARCH_XCORE)) { - printf(" xcore: xcore\n"); + printf(" xcore xcore\n"); } if (cs_support(CS_ARCH_M68K)) { - printf(" m68k: m68k + big endian\n"); - printf(" m68k40: m68k_040\n"); + printf(" m68k m68k + big endian\n"); + printf(" m68k40 m68k_040\n"); } if (cs_support(CS_ARCH_TMS320C64X)) { - printf(" tms320c64x:TMS320C64x\n"); + printf(" tms320c64x TMS320C64x\n"); } if (cs_support(CS_ARCH_M680X)) { - printf(" m6800: M6800/2\n"); - printf(" m6801: M6801/3\n"); - printf(" m6805: M6805\n"); - printf(" m6808: M68HC08\n"); - printf(" m6809: M6809\n"); - printf(" m6811: M68HC11\n"); - printf(" cpu12: M68HC12/HCS12\n"); - printf(" hd6301: HD6301/3\n"); - printf(" hd6309: HD6309\n"); - printf(" hcs08: HCS08\n"); + printf(" m6800 M6800/2\n"); + printf(" m6801 M6801/3\n"); + printf(" m6805 M6805\n"); + printf(" m6808 M68HC08\n"); + printf(" m6809 M6809\n"); + printf(" m6811 M68HC11\n"); + printf(" cpu12 M68HC12/HCS12\n"); + printf(" hd6301 HD6301/3\n"); + printf(" hd6309 HD6309\n"); + printf(" hcs08 HCS08\n"); } if (cs_support(CS_ARCH_EVM)) { - printf(" evm: Ethereum Virtual Machine\n"); + printf(" evm Ethereum Virtual Machine\n"); } if (cs_support(CS_ARCH_MOS65XX)) { - printf(" mox65xx: MOS65XX family\n"); + printf(" mox65xx MOS65XX family\n"); } printf("\nExtra options:\n"); @@ -308,7 +308,7 @@ int main(int argc, char **argv) detail_flag = true; break; case 'v': - printf("Cstool for Capstone Disassembler Engine v%u.%u.%u\n", CS_VERSION_MAJOR, CS_VERSION_MINOR, CS_VERSION_EXTRA); + printf("cstool for Capstone Disassembler, v%u.%u.%u\n", CS_VERSION_MAJOR, CS_VERSION_MINOR, CS_VERSION_EXTRA); printf("Capstone build: "); if (cs_support(CS_ARCH_X86)) { diff --git a/include/capstone/capstone.h b/include/capstone/capstone.h index 58fd6190e..6e1ee1d0b 100644 --- a/include/capstone/capstone.h +++ b/include/capstone/capstone.h @@ -47,8 +47,8 @@ extern "C" { #endif // Capstone API version -#define CS_API_MAJOR 4 -#define CS_API_MINOR 1 +#define CS_API_MAJOR 5 +#define CS_API_MINOR 0 // Version for bleeding edge code of the Github's "next" branch. // Use this if you want the absolutely latest development code. diff --git a/pkgconfig.mk b/pkgconfig.mk index 3fadac2ec..5c05acb79 100644 --- a/pkgconfig.mk +++ b/pkgconfig.mk @@ -2,8 +2,8 @@ # To be used to generate capstone.pc for pkg-config # version major & minor -PKG_MAJOR = 4 -PKG_MINOR = 1 +PKG_MAJOR = 5 +PKG_MINOR = 0 # version bugfix level. Example: PKG_EXTRA = 1 PKG_EXTRA = 0