From 1d2e69b869cabfac6dab9cc484304c9b4cd6c636 Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Thu, 15 May 2014 13:56:54 +0800 Subject: [PATCH] msvc: remove headers/ directory & replace it with include/platform.h --- arch/Mips/MipsMapping.c | 6 +--- include/capstone.h | 2 ++ msvc/headers/inttypes.h => include/platform.h | 31 +++++++++++++++++-- msvc/capstone_dll/capstone_dll.vcxproj | 4 --- msvc/capstone_static/capstone_static.vcxproj | 4 --- msvc/headers/platform.h | 5 --- msvc/headers/stdbool.h | 8 ----- msvc/test/test.vcxproj | 4 --- msvc/test_arm/test_arm.vcxproj | 4 --- msvc/test_arm64/test_arm64.vcxproj | 4 --- msvc/test_detail/test_detail.vcxproj | 4 --- msvc/test_mips/test_mips.vcxproj | 4 --- msvc/test_ppc/test_ppc.vcxproj | 4 --- msvc/test_skipdata/test_skipdata.vcxproj | 4 --- msvc/test_sparc/test_sparc.vcxproj | 4 --- msvc/test_systemz/test_systemz.vcxproj | 4 --- msvc/test_x86/test_x86.vcxproj | 4 --- utils.c | 5 --- 18 files changed, 32 insertions(+), 73 deletions(-) rename msvc/headers/inttypes.h => include/platform.h (68%) delete mode 100644 msvc/headers/platform.h delete mode 100644 msvc/headers/stdbool.h diff --git a/arch/Mips/MipsMapping.c b/arch/Mips/MipsMapping.c index 684ae175..4b014803 100644 --- a/arch/Mips/MipsMapping.c +++ b/arch/Mips/MipsMapping.c @@ -8,11 +8,7 @@ #include "../../include/mips.h" #include "../../utils.h" -#if !defined(__MINGW32__) && !defined(__MINGW64__) -#if defined (WIN32) || defined (WIN64) || defined (_WIN32) || defined (_WIN64) -#include "platform.h" -#endif -#endif + #include "MipsMapping.h" #define GET_INSTRINFO_ENUM diff --git a/include/capstone.h b/include/capstone.h index 1c67e42f..40765607 100644 --- a/include/capstone.h +++ b/include/capstone.h @@ -14,6 +14,8 @@ extern "C" { #include #include +#include "platform.h" + #ifdef _MSC_VER #pragma warning(disable:4201) #pragma warning(disable:4100) diff --git a/msvc/headers/inttypes.h b/include/platform.h similarity index 68% rename from msvc/headers/inttypes.h rename to include/platform.h index 42409c02..fad25b16 100644 --- a/msvc/headers/inttypes.h +++ b/include/platform.h @@ -1,5 +1,14 @@ -#pragma once +/* Capstone Disassembly Engine */ +/* By Axel Souchet & Nguyen Anh Quynh, 2014 */ +// prototypes for MSVC +#ifndef CAPSTONE_PLATFORM_H +#define CAPSTONE_PLATFORM_H + +#if !defined(__MINGW32__) && !defined(__MINGW64__) // this is not MingW +#if defined (WIN32) || defined (WIN64) || defined (_WIN32) || defined (_WIN64) + +// inttypes.h typedef signed char int8_t; typedef signed short int16_t; typedef signed int int32_t; @@ -38,4 +47,22 @@ typedef unsigned long long uint64_t; #define PRIo64 __PRI_64_LENGTH_MODIFIER__ "o" #define PRIu64 __PRI_64_LENGTH_MODIFIER__ "u" #define PRIx64 __PRI_64_LENGTH_MODIFIER__ "x" -#define PRIX64 __PRI_64_LENGTH_MODIFIER__ "X" \ No newline at end of file +#define PRIX64 __PRI_64_LENGTH_MODIFIER__ "X" + + +// stdbool.h +#ifndef __cplusplus + typedef unsigned char bool; + + #define false 0 + #define true 1 +#endif + + +// string.h +#define strcasecmp _stricmp + +#endif // MSVC +#endif // not MingW + +#endif diff --git a/msvc/capstone_dll/capstone_dll.vcxproj b/msvc/capstone_dll/capstone_dll.vcxproj index b234e2da..7a769b44 100644 --- a/msvc/capstone_dll/capstone_dll.vcxproj +++ b/msvc/capstone_dll/capstone_dll.vcxproj @@ -90,7 +90,6 @@ Disabled CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_USE_SYS_DYN_MEM;WIN32;_DEBUG;_WINDOWS;_USRDLL;CAPSTONEDLL_EXPORTS;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Windows @@ -106,7 +105,6 @@ Disabled CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_USE_SYS_DYN_MEM;WIN32;_DEBUG;_WINDOWS;_USRDLL;CAPSTONEDLL_EXPORTS;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Windows @@ -124,7 +122,6 @@ true CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_USE_SYS_DYN_MEM;WIN32;NDEBUG;_WINDOWS;_USRDLL;CAPSTONEDLL_EXPORTS;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Windows @@ -144,7 +141,6 @@ true CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_USE_SYS_DYN_MEM;WIN32;NDEBUG;_WINDOWS;_USRDLL;CAPSTONEDLL_EXPORTS;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Windows diff --git a/msvc/capstone_static/capstone_static.vcxproj b/msvc/capstone_static/capstone_static.vcxproj index 91f990ec..8d4b75b6 100644 --- a/msvc/capstone_static/capstone_static.vcxproj +++ b/msvc/capstone_static/capstone_static.vcxproj @@ -127,7 +127,6 @@ Disabled CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_USE_SYS_DYN_MEM;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true - ..\headers;..\..\include;%(AdditionalIncludeDirectories) Windows @@ -142,7 +141,6 @@ Disabled CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_USE_SYS_DYN_MEM;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true - ..\headers;..\..\include;%(AdditionalIncludeDirectories) Windows @@ -159,7 +157,6 @@ true CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_USE_SYS_DYN_MEM;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true - ..\headers;..\..\include;%(AdditionalIncludeDirectories) Windows @@ -178,7 +175,6 @@ true CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_ARM;CAPSTONE_HAS_ARM64;CAPSTONE_HAS_MIPS;CAPSTONE_HAS_POWERPC;CAPSTONE_HAS_SPARC;CAPSTONE_HAS_SYSZ;CAPSTONE_HAS_X86;CAPSTONE_USE_SYS_DYN_MEM;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true - ..\headers;..\..\include;%(AdditionalIncludeDirectories) Windows diff --git a/msvc/headers/platform.h b/msvc/headers/platform.h deleted file mode 100644 index 3c21bbd2..00000000 --- a/msvc/headers/platform.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#if defined (WIN32) || defined (WIN64) || defined (_WIN32) || defined (_WIN64) - #define strcasecmp _stricmp -#endif diff --git a/msvc/headers/stdbool.h b/msvc/headers/stdbool.h deleted file mode 100644 index 51c23090..00000000 --- a/msvc/headers/stdbool.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -#ifndef __cplusplus - typedef unsigned char bool; - - #define false 0 - #define true 1 -#endif diff --git a/msvc/test/test.vcxproj b/msvc/test/test.vcxproj index fbf1a5af..8b1dc3c2 100644 --- a/msvc/test/test.vcxproj +++ b/msvc/test/test.vcxproj @@ -87,7 +87,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -104,7 +103,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -123,7 +121,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -144,7 +141,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console diff --git a/msvc/test_arm/test_arm.vcxproj b/msvc/test_arm/test_arm.vcxproj index 3980f22a..91010746 100644 --- a/msvc/test_arm/test_arm.vcxproj +++ b/msvc/test_arm/test_arm.vcxproj @@ -87,7 +87,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -104,7 +103,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -123,7 +121,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -144,7 +141,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console diff --git a/msvc/test_arm64/test_arm64.vcxproj b/msvc/test_arm64/test_arm64.vcxproj index 40f35729..2aafe968 100644 --- a/msvc/test_arm64/test_arm64.vcxproj +++ b/msvc/test_arm64/test_arm64.vcxproj @@ -87,7 +87,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -104,7 +103,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -123,7 +121,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -144,7 +141,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console diff --git a/msvc/test_detail/test_detail.vcxproj b/msvc/test_detail/test_detail.vcxproj index 5115d9e5..2478acd7 100644 --- a/msvc/test_detail/test_detail.vcxproj +++ b/msvc/test_detail/test_detail.vcxproj @@ -87,7 +87,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -104,7 +103,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -123,7 +121,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -144,7 +141,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console diff --git a/msvc/test_mips/test_mips.vcxproj b/msvc/test_mips/test_mips.vcxproj index 89d3e6f8..a4424c8f 100644 --- a/msvc/test_mips/test_mips.vcxproj +++ b/msvc/test_mips/test_mips.vcxproj @@ -87,7 +87,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -104,7 +103,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -123,7 +121,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -144,7 +141,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console diff --git a/msvc/test_ppc/test_ppc.vcxproj b/msvc/test_ppc/test_ppc.vcxproj index c8e4c3f5..ffbe9de4 100644 --- a/msvc/test_ppc/test_ppc.vcxproj +++ b/msvc/test_ppc/test_ppc.vcxproj @@ -90,7 +90,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -107,7 +106,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -126,7 +124,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -147,7 +144,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console diff --git a/msvc/test_skipdata/test_skipdata.vcxproj b/msvc/test_skipdata/test_skipdata.vcxproj index 84b1320a..8b04be6a 100644 --- a/msvc/test_skipdata/test_skipdata.vcxproj +++ b/msvc/test_skipdata/test_skipdata.vcxproj @@ -87,7 +87,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -104,7 +103,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -123,7 +121,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -144,7 +141,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console diff --git a/msvc/test_sparc/test_sparc.vcxproj b/msvc/test_sparc/test_sparc.vcxproj index d9f242a3..dcbd1bdb 100644 --- a/msvc/test_sparc/test_sparc.vcxproj +++ b/msvc/test_sparc/test_sparc.vcxproj @@ -87,7 +87,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -104,7 +103,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -123,7 +121,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -144,7 +141,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console diff --git a/msvc/test_systemz/test_systemz.vcxproj b/msvc/test_systemz/test_systemz.vcxproj index 397ac3a2..79656860 100644 --- a/msvc/test_systemz/test_systemz.vcxproj +++ b/msvc/test_systemz/test_systemz.vcxproj @@ -90,7 +90,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -107,7 +106,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -126,7 +124,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -147,7 +144,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console diff --git a/msvc/test_x86/test_x86.vcxproj b/msvc/test_x86/test_x86.vcxproj index 7d175dd8..708b6506 100644 --- a/msvc/test_x86/test_x86.vcxproj +++ b/msvc/test_x86/test_x86.vcxproj @@ -87,7 +87,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -104,7 +103,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -123,7 +121,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console @@ -144,7 +141,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\include;..\headers;%(AdditionalIncludeDirectories) Console diff --git a/utils.c b/utils.c index d72a659c..2dbe2ee5 100644 --- a/utils.c +++ b/utils.c @@ -5,11 +5,6 @@ #include #include "utils.h" -#if !defined(__MINGW32__) && !defined(__MINGW64__) -#if defined (WIN32) || defined (WIN64) || defined (_WIN32) || defined (_WIN64) -#include "platform.h" -#endif -#endif // return the position of a string in a list of strings // or -1 if given string is not in the list