Merge branch 'master' into v3

SStream.c

@@ -8,7 +8,7 @@
 
 #include "SStream.h"
 #include "cs_priv.h"
-#include "inttypes.h"
+#include "myinttypes.h"
 #include "utils.h"
 
 #ifdef _MSC_VER

arch/AArch64/AArch64InstPrinter.c

@@ -16,7 +16,7 @@
 
 #ifdef CAPSTONE_HAS_ARM64
 
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 #include <stdio.h>
 #include <stdlib.h>
 

arch/ARM/ARMDisassembler.c

@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 
 #include "ARMAddressingModes.h"
 #include "ARMBaseInfo.h"

arch/ARM/ARMInstPrinter.c

@@ -19,7 +19,7 @@
 #include <stdio.h>	// DEBUG
 #include <stdlib.h>
 #include <string.h>
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 
 #include "ARMInstPrinter.h"
 #include "ARMAddressingModes.h"

arch/Mips/MipsDisassembler.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 
 #include "../../utils.h"
 

arch/Mips/MipsInstPrinter.c

@@ -16,7 +16,7 @@
 
 #ifdef CAPSTONE_HAS_MIPS
 
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 #include <stdlib.h>
 #include <stdio.h>	// debug
 #include <string.h>

arch/PowerPC/PPCGenAsmWriter.inc

@@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */
 
 #include <stdio.h>	// debug
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 
 /// printInstruction - This method is automatically generated by tablegen
 /// from the instruction set description.

arch/Sparc/SparcGenAsmWriter.inc

@@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */
 
 #include <stdio.h>	// debug
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 
 
 /// printInstruction - This method is automatically generated by tablegen

arch/SystemZ/SystemZGenAsmWriter.inc

@@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */
 
 #include <stdio.h>	// debug
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 
 
 /// printInstruction - This method is automatically generated by tablegen

arch/SystemZ/SystemZInstPrinter.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 
 #include "SystemZInstPrinter.h"
 #include "../../MCInst.h"

arch/X86/X86ATTInstPrinter.c

@@ -19,7 +19,7 @@
 #if defined(CAPSTONE_HAS_X86) && !defined(CAPSTONE_DIET) && !defined(CAPSTONE_X86_ATT_DISABLE)
 
 #include <ctype.h>
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

arch/X86/X86Disassembler.c

@@ -19,7 +19,7 @@
 
 #ifdef CAPSTONE_HAS_X86
 
-#include "../../inttypes.h"	// debug
+#include "../../myinttypes.h"	// debug
 #include <string.h>
 
 #include "../../cs_priv.h"

arch/X86/X86IntelInstPrinter.c

@@ -18,7 +18,7 @@
 #ifdef CAPSTONE_HAS_X86
 
 #include <ctype.h>
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

arch/XCore/XCoreGenAsmWriter.inc

@@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */
 
 #include <stdio.h>	// debug
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 
 
 /// printInstruction - This method is automatically generated by tablegen

arch/XCore/XCoreInstPrinter.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 
 #include "XCoreInstPrinter.h"
 #include "../../MCInst.h"

bindings/python/Makefile

@@ -13,13 +13,21 @@ install:
 	rm -rf $(OBJDIR) src/
 	rm -rf prebuilt/win64/capstone.dll
 	rm -rf prebuilt/win32/capstone.dll
-	python setup.py build -b $(OBJDIR) install
+	if test -n "${DESTDIR}"; then \
+		python setup.py build -b $(OBJDIR) install --root="${DESTDIR}"; \
+	else \
+		python setup.py build -b $(OBJDIR) install; \
+	fi
 
 install3:
 	rm -rf $(OBJDIR) src/
 	rm -rf prebuilt/win64/capstone.dll
 	rm -rf prebuilt/win32/capstone.dll
-	python3 setup.py build -b $(OBJDIR) install
+	if test -n "${DESTDIR}"; then \
+		python3 setup.py build -b $(OBJDIR) install --root="${DESTDIR}"; \
+	else \
+		python3 setup.py build -b $(OBJDIR) install; \
+	fi
 
 # NOTE: Newer cython can be installed by: sudo pip install --upgrade cython
 install_cython:

include/x86.h

@@ -183,7 +183,7 @@ typedef struct x86_op_mem {
 typedef struct cs_x86_op {
 		x86_op_type type;	// operand type
 		union {
-			unsigned int reg;	// register value for REG operand
+			x86_reg reg;	// register value for REG operand
 			int64_t imm;		// immediate value for IMM operand
 			double fp;		// floating point value for FP operand
 			x86_op_mem mem;		// base/index/scale/disp value for MEM operand

suite/arm/test_arm_regression.c

@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../../inttypes.h"
+#include "../../myinttypes.h"
 
 #include <capstone.h>
 

tests/test.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../inttypes.h"
+#include "../myinttypes.h"
 
 #include <capstone.h>
 

tests/test_arm.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../inttypes.h"
+#include "../myinttypes.h"
 
 #include <capstone.h>
 

tests/test_arm64.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../inttypes.h"
+#include "../myinttypes.h"
 
 #include <capstone.h>
 

tests/test_detail.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../inttypes.h"
+#include "../myinttypes.h"
 
 #include <capstone.h>
 

tests/test_iter.c

@@ -4,7 +4,7 @@
 // This sample code demonstrates the APIs cs_malloc() & cs_disasm_iter().
 #include <stdio.h>
 #include <stdlib.h>
-#include "../inttypes.h"
+#include "../myinttypes.h"
 
 #include <capstone.h>
 

tests/test_mips.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../inttypes.h"
+#include "../myinttypes.h"
 
 #include <capstone.h>
 

tests/test_ppc.c

@@ -2,7 +2,7 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013> */
 
 #include <stdio.h>
-#include "../inttypes.h"
+#include "../myinttypes.h"
 
 #include <capstone.h>
 

tests/test_skipdata.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../inttypes.h"
+#include "../myinttypes.h"
 
 #include <capstone.h>
 

tests/test_sparc.c

@@ -2,7 +2,7 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */
 
 #include <stdio.h>
-#include "../inttypes.h"
+#include "../myinttypes.h"
 
 #include <capstone.h>
 

tests/test_systemz.c

@@ -2,7 +2,7 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */
 
 #include <stdio.h>
-#include "../inttypes.h"
+#include "../myinttypes.h"
 
 #include <capstone.h>
 

tests/test_x86.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../inttypes.h"
+#include "../myinttypes.h"
 
 #include <capstone.h>
 

tests/test_xcore.c

@@ -2,7 +2,7 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */
 
 #include <stdio.h>
-#include "../inttypes.h"
+#include "../myinttypes.h"
 
 #include <capstone.h>