Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -102,3 +102,4 @@ test_iter_benchmark
 
 
 *.s
+.DS_Store

CMakeLists.txt

@@ -60,7 +60,6 @@ set(HEADERS_ENGINE
     MCInstrDesc.h
     SStream.h
     cs_priv.h
-    myinttypes.h
     include/platform.h
     )
 

SStream.c

@@ -12,7 +12,8 @@
 #endif
 #include <string.h>
 
-#include "myinttypes.h"
+#include <platform.h>
+
 #include "SStream.h"
 #include "cs_priv.h"
 #include "utils.h"

arch/AArch64/AArch64InstPrinter.c

@@ -16,7 +16,7 @@
 
 #ifdef CAPSTONE_HAS_ARM64
 
-#include "../../myinttypes.h"
+#include <platform.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 "../../myinttypes.h"
+#include <platform.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 "../../myinttypes.h"
+#include <platform.h>
 
 #include "ARMInstPrinter.h"
 #include "ARMAddressingModes.h"

arch/Mips/MipsDisassembler.c

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

arch/Mips/MipsInstPrinter.c

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

arch/PowerPC/PPCGenAsmWriter.inc

@@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2014 */
 
 #include <stdio.h>	// debug
-#include "../../myinttypes.h"
+#include <platform.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 <[email protected]>, 2013-2014 */
 
 #include <stdio.h>	// debug
-#include "../../myinttypes.h"
+#include <platform.h>
 
 
 /// printInstruction - This method is automatically generated by tablegen

arch/SystemZ/SystemZGenAsmWriter.inc

@@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2014 */
 
 #include <stdio.h>	// debug
-#include "../../myinttypes.h"
+#include <platform.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 "../../myinttypes.h"
+#include <platform.h>
 
 #include "SystemZInstPrinter.h"
 #include "../../MCInst.h"

arch/X86/X86ATTInstPrinter.c

@@ -21,7 +21,7 @@
 #if !defined(CAPSTONE_HAS_OSXKERNEL)
 #include <ctype.h>
 #endif
-#include "../../myinttypes.h"
+#include <platform.h>
 #if defined(CAPSTONE_HAS_OSXKERNEL)
 #include <libkern/libkern.h>
 #else

arch/X86/X86Disassembler.c

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

arch/X86/X86IntelInstPrinter.c

@@ -20,7 +20,7 @@
 #if !defined(CAPSTONE_HAS_OSXKERNEL)
 #include <ctype.h>
 #endif
-#include "../../myinttypes.h"
+#include <platform.h>
 #if defined(CAPSTONE_HAS_OSXKERNEL)
 #include <libkern/libkern.h>
 #else

arch/XCore/XCoreGenAsmWriter.inc

@@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2014 */
 
 #include <stdio.h>	// debug
-#include "../../myinttypes.h"
+#include <platform.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 "../../myinttypes.h"
+#include <platform.h>
 
 #include "XCoreInstPrinter.h"
 #include "../../MCInst.h"

cs.c

@@ -476,6 +476,10 @@ size_t CAPSTONE_API cs_disasm(csh ud, const uint8_t *buffer, size_t size, uint64
 
 	handle->errnum = CS_ERR_OK;
 
+	// reset IT block of ARM structure
+	if (handle->arch == CS_ARCH_ARM)
+		handle->ITBlock.size = 0;
+
 #ifdef CAPSTONE_USE_SYS_DYN_MEM
 	if (count > 0 && count <= INSN_CACHE_SIZE)
 		cache_size = (unsigned int) count;

include/capstone.h

@@ -124,7 +124,7 @@ typedef struct cs_opt_mem {
 
 // Runtime option for the disassembled engine
 typedef enum cs_opt_type {
-	CS_OPT_INVALID = 0,	// No opetion specified
+	CS_OPT_INVALID = 0,	// No option specified
 	CS_OPT_SYNTAX,	// Assembly output syntax
 	CS_OPT_DETAIL,	// Break down instruction structure into details
 	CS_OPT_MODE,	// Change engine's mode at run-time
@@ -512,7 +512,7 @@ cs_insn * CAPSTONE_API cs_malloc(csh handle);
  
  @handle: handle returned by cs_open()
  @code: buffer containing raw binary code to be disassembled
- @code_size: size of above code
+ @size: size of above code
  @address: address of the first insn in given raw code buffer
  @insn: pointer to instruction to be filled in by this API.
 

suite/arm/test_arm_regression.c

@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../../myinttypes.h"
 
+#include <platform.h>
 #include <capstone.h>
 
 static csh handle;

suite/benchmark/test_iter_benchmark.c

@@ -4,8 +4,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include "../myinttypes.h"
 
+#include <platform.h>
 #include <capstone.h>
 
 static void test()

tests/test.c

@@ -3,8 +3,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"
 
+#include <platform.h>
 #include <capstone.h>
 
 struct platform {

tests/test_arm.c

@@ -3,8 +3,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"
 
+#include <platform.h>
 #include <capstone.h>
 
 static csh handle;

tests/test_arm64.c

@@ -3,8 +3,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"
 
+#include <platform.h>
 #include <capstone.h>
 
 static csh handle;

tests/test_detail.c

@@ -3,8 +3,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"
 
+#include <platform.h>
 #include <capstone.h>
 
 struct platform {

tests/test_iter.c

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

tests/test_mips.c

@@ -3,8 +3,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"
 
+#include <platform.h>
 #include <capstone.h>
 
 struct platform {

tests/test_ppc.c

@@ -2,8 +2,8 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013> */
 
 #include <stdio.h>
-#include "../myinttypes.h"
 
+#include <platform.h>
 #include <capstone.h>
 
 struct platform {

tests/test_skipdata.c

@@ -3,8 +3,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"
 
+#include <platform.h>
 #include <capstone.h>
 
 struct platform {

tests/test_sparc.c

@@ -2,8 +2,8 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2014 */
 
 #include <stdio.h>
-#include "../myinttypes.h"
 
+#include <platform.h>
 #include <capstone.h>
 
 struct platform {

tests/test_systemz.c

@@ -2,8 +2,8 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2014 */
 
 #include <stdio.h>
-#include "../myinttypes.h"
 
+#include <platform.h>
 #include <capstone.h>
 
 struct platform {