Merge branch 'next' of https://github.com/aquynh/capstone into next
diff --git a/bindings/java/capstone/Capstone.java b/bindings/java/capstone/Capstone.java
index 7e6435a..e99822f 100644
--- a/bindings/java/capstone/Capstone.java
+++ b/bindings/java/capstone/Capstone.java
@@ -349,6 +349,7 @@
// Query id for cs_support()
public static final int CS_SUPPORT_DIET = CS_ARCH_ALL+1; // diet mode
+ public static final int CS_SUPPORT_X86_REDUCE = CS_ARCH_ALL+2; // X86 reduce mode
protected class NativeStruct {
private NativeLong csh;
diff --git a/bindings/python/pyx/ccapstone.pyx b/bindings/python/pyx/ccapstone.pyx
index 1730956..13c3fbe 100644
--- a/bindings/python/pyx/ccapstone.pyx
+++ b/bindings/python/pyx/ccapstone.pyx
@@ -315,7 +315,8 @@
archs = { "arm": capstone.CS_ARCH_ARM, "arm64": capstone.CS_ARCH_ARM64, \
"mips": capstone.CS_ARCH_MIPS, "ppc": capstone.CS_ARCH_PPC, \
- "sparc": capstone.CS_ARCH_SPARC, "sysz": capstone.CS_ARCH_SYSZ }
+ "sparc": capstone.CS_ARCH_SPARC, "sysz": capstone.CS_ARCH_SYSZ, \
+ "xcore": capstone.CS_ARCH_XCORE }
all_archs = ""
keys = archs.keys()
@@ -332,4 +333,3 @@
(major, minor, _combined) = capstone.cs_version()
return "Cython-%s%s-c%u.%u-b%u.%u" %(diet, all_archs, major, minor, capstone.CS_API_MAJOR, capstone.CS_API_MINOR)
-
diff --git a/include/capstone.h b/include/capstone.h
index 02ef6c1..2954cf1 100644
--- a/include/capstone.h
+++ b/include/capstone.h
@@ -58,7 +58,7 @@
CS_ARCH_SYSZ, // SystemZ architecture
CS_ARCH_XCORE, // XCore architecture
CS_ARCH_MAX,
- CS_ARCH_ALL = 0xFFFF,
+ CS_ARCH_ALL = 0xFFFF, // All architectures - for cs_support()
} cs_arch;
// Support value to verify diet mode of the engine.