Added support for building binaries for Windows CE 7 on ARMv7 (a.k.a.…

…, Windows Embedded Compact 7) and for Windows CE 8 on ARMv7 (a.k.a., Windows Embedded Compact 2013).

Added support for building binaries for Windows CE 7 on ARMv7 (a.k.a., Windows Embedded Compact 7) and for Windows CE 8 on ARMv7 (a.k.a., Windows Embedded Compact 2013).

Added support for building binaries for Windows CE 7 on ARMv7 (a.k.a., Windows Embedded Compact 7) and for Windows CE 8 on ARMv7 (a.k.a., Windows Embedded Compact 2013).

Replaced header inclusions of "stdint.h" and "intrin.h" by selective inclusions to support platforms that do not provide those headers. The header "platform.h" handles the platform test.
Updated the build script for Windows CE 7 on ARMv7.

LEB128.h

@@ -18,7 +18,7 @@
 #ifndef CS_LLVM_SUPPORT_LEB128_H
 #define CS_LLVM_SUPPORT_LEB128_H
 
-#include <stdint.h>
+#include "include/capstone/capstone.h"
 
 /// Utility function to decode a ULEB128 value.
 static inline uint64_t decodeULEB128(const uint8_t *p, unsigned *n)

MCInst.h

@@ -19,8 +19,6 @@
 #ifndef CS_MCINST_H
 #define CS_MCINST_H
 
-#include <stdint.h>
-
 #include "include/capstone/capstone.h"
 
 typedef struct MCInst MCInst;

MCInstrDesc.h

@@ -18,7 +18,6 @@
 #ifndef CS_LLVM_MC_MCINSTRDESC_H
 #define CS_LLVM_MC_MCINSTRDESC_H
 
-#include <stdint.h>
 #include "capstone/platform.h"
 
 //===----------------------------------------------------------------------===//

MCRegisterInfo.h

@@ -19,7 +19,6 @@
 #ifndef CS_LLVM_MC_MCREGISTERINFO_H
 #define CS_LLVM_MC_MCREGISTERINFO_H
 
-#include <stdint.h>
 #include "capstone/platform.h"
 
 /// An unsigned integer type large enough to represent all physical registers,

MathExtras.h

@@ -17,9 +17,9 @@
 #ifndef CS_LLVM_SUPPORT_MATHEXTRAS_H
 #define CS_LLVM_SUPPORT_MATHEXTRAS_H
 
-#include <stdint.h>
-
-#ifdef _MSC_VER
+#if defined(_WIN32_WCE) && (_WIN32_WCE < 0x800)
+#include "windowsce/intrin.h"
+#elif defined(_MSC_VER)
 # include <intrin.h>
 #endif
 

SStream.c

@@ -1,7 +1,6 @@
 /* Capstone Disassembly Engine */
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2015 */
 
-#include <stdint.h>
 #include <stdarg.h>
 #if defined(CAPSTONE_HAS_OSXKERNEL)
 #include <libkern/libkern.h>

SStream.h

@@ -4,6 +4,8 @@
 #ifndef CS_SSTREAM_H_
 #define CS_SSTREAM_H_
 
+#include "include/capstone/platform.h"
+
 typedef struct SStream {
 	char buffer[512];
 	int index;

arch/AArch64/AArch64BaseInfo.h

@@ -21,7 +21,6 @@
 #define CS_LLVM_AARCH64_BASEINFO_H
 
 #include <ctype.h>
-#include <stdint.h>
 #include <string.h>
 
 #ifndef __cplusplus

arch/AArch64/AArch64Disassembler.h

@@ -4,8 +4,6 @@
 #ifndef CS_AARCH64_DISASSEMBLER_H
 #define CS_AARCH64_DISASSEMBLER_H
 
-#include <stdint.h>
-
 #include "capstone/capstone.h"
 #include "../../MCRegisterInfo.h"
 #include "../../MCInst.h"

arch/AArch64/AArch64InstPrinter.c

@@ -1642,9 +1642,12 @@ static void printSystemPStateField(MCInst *MI, unsigned OpNo, SStream *O)
 			MI->flat_insn->detail->arm64.op_count++;
 		}
 	} else {
+#ifndef CAPSTONE_DIET
+		unsigned char access;
+#endif
 		printInt32Bang(O, Val);
 #ifndef CAPSTONE_DIET
-		unsigned char access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
+		access = get_op_access(MI->csh, MCInst_getOpcode(MI), MI->ac_idx);
 		MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].access = access;
 		MI->ac_idx++;
 #endif

arch/M68K/M68KDisassembler.h

@@ -5,7 +5,6 @@
 #define CS_M68KDISASSEMBLER_H
 
 #include "../../MCInst.h"
-#include <stdint.h>
 
 /* Private, For internal use only */
 typedef struct m68k_info {

arch/M68K/M68KInstPrinter.h

@@ -4,8 +4,6 @@
 #ifndef CS_M68KINSTPRINTER_H
 #define CS_M68KINSTPRINTER_H
 
-#include <stdint.h>
-
 #include "capstone/capstone.h"
 #include "../../MCRegisterInfo.h"
 #include "../../MCInst.h"

arch/PowerPC/PPCDisassembler.h

@@ -4,8 +4,6 @@
 #ifndef CS_PPCDISASSEMBLER_H
 #define CS_PPCDISASSEMBLER_H
 
-#include <stdint.h>
-
 #include "capstone/capstone.h"
 #include "../../MCRegisterInfo.h"
 #include "../../MCInst.h"

arch/Sparc/SparcDisassembler.h

@@ -4,8 +4,6 @@
 #ifndef CS_SPARCDISASSEMBLER_H
 #define CS_SPARCDISASSEMBLER_H
 
-#include <stdint.h>
-
 #include "capstone/capstone.h"
 #include "../../MCRegisterInfo.h"
 #include "../../MCInst.h"

arch/SystemZ/SystemZDisassembler.h

@@ -4,8 +4,6 @@
 #ifndef CS_SYSZDISASSEMBLER_H
 #define CS_SYSZDISASSEMBLER_H
 
-#include <stdint.h>
-
 #include "capstone/capstone.h"
 #include "../../MCRegisterInfo.h"
 #include "../../MCInst.h"

arch/X86/X86Disassembler.h

@@ -77,8 +77,6 @@
 #ifndef CS_X86_DISASSEMBLER_H
 #define CS_X86_DISASSEMBLER_H
 
-#include <stdint.h>
-
 #include "capstone/capstone.h"
 
 #include "../../MCInst.h"

arch/X86/X86DisassemblerDecoder.h

@@ -24,7 +24,6 @@
 #else
 #include <stdio.h>
 #endif
-#include <stdint.h>
 
 #include "X86DisassemblerDecoderCommon.h"
 

arch/X86/X86DisassemblerDecoderCommon.h

@@ -25,8 +25,6 @@
 #ifndef CS_X86_DISASSEMBLERDECODERCOMMON_H
 #define CS_X86_DISASSEMBLERDECODERCOMMON_H
 
-#include <stdint.h>
-
 #define INSTRUCTIONS_SYM  x86DisassemblerInstrSpecifiers
 #define CONTEXTS_SYM      x86DisassemblerContexts
 #define ONEBYTE_SYM       x86DisassemblerOneByteOpcodes

arch/XCore/XCoreDisassembler.h

@@ -4,8 +4,6 @@
 #ifndef CS_XCOREDISASSEMBLER_H
 #define CS_XCOREDISASSEMBLER_H
 
-#include <stdint.h>
-
 #include "capstone/capstone.h"
 #include "../../MCRegisterInfo.h"
 #include "../../MCInst.h"

include/capstone/arm.h

@@ -8,7 +8,6 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
 #include "platform.h"
 
 #ifdef _MSC_VER

include/capstone/arm64.h

@@ -8,7 +8,6 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
 #include "platform.h"
 
 #ifdef _MSC_VER

include/capstone/capstone.h

@@ -8,7 +8,6 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
 #include <stdarg.h>
 #if defined(CAPSTONE_HAS_OSXKERNEL)
 #include <libkern/libkern.h>

include/capstone/m68k.h

@@ -8,7 +8,6 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
 #include "platform.h"
 
 #ifdef _MSC_VER

include/capstone/mips.h

@@ -8,7 +8,6 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
 #include "platform.h"
 
 // GCC MIPS toolchain has a default macro called "mips" which breaks

include/capstone/platform.h

@@ -5,6 +5,12 @@
 #ifndef CAPSTONE_PLATFORM_H
 #define CAPSTONE_PLATFORM_H
 
+#if defined(_WIN32_WCE) && (_WIN32_WCE < 0x800)
+#include "windowsce/stdint.h"
+#else // Platforms where stdint.h is provided
+#include <stdint.h>
+#endif
+
 #if !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__MINGW64__) && (defined (WIN32) || defined (WIN64) || defined (_WIN32) || defined (_WIN64))
 // MSVC
 

include/capstone/ppc.h

@@ -8,7 +8,6 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
 #include "platform.h"
 
 #ifdef _MSC_VER

include/capstone/sparc.h

@@ -8,7 +8,6 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
 #include "platform.h"
 
 // GCC SPARC toolchain has a default macro called "sparc" which breaks

include/capstone/systemz.h

@@ -8,7 +8,6 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
 #include "platform.h"
 
 #ifdef _MSC_VER

include/capstone/x86.h

@@ -8,7 +8,7 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
+#include "platform.h"
 
 // Calculate relative address for X86-64, given cs_insn structure
 #define X86_REL_ADDR(insn) (insn.address + insn.size + insn.detail->x86.disp)

include/capstone/xcore.h

@@ -8,7 +8,6 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
 #include "platform.h"
 
 #ifdef _MSC_VER

include/windowsce/intrin.h

@@ -0,0 +1,12 @@
+
+#if defined(_MSC_VER) && defined(_WIN32_WCE) && (_WIN32_WCE < 0x800) && !defined(__INTRIN_H_) && !defined(_INTRIN)
+#define _STDINT
+
+#ifdef _M_ARM
+#include <armintr.h>
+#if (_WIN32_WCE >= 0x700) && defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
+#include <arm_neon.h>
+#endif
+#endif // _M_ARM
+
+#endif