diff --git a/bindings/java/unicorn_Unicorn.c b/bindings/java/unicorn_Unicorn.c index c9cef604..b5690882 100644 --- a/bindings/java/unicorn_Unicorn.c +++ b/bindings/java/unicorn_Unicorn.c @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include -#include "platform.h" +#include "unicorn/platform.h" #include #include diff --git a/bindings/msvc/samples/main.c b/bindings/msvc/samples/main.c index 0b99d83c..3d3f109d 100644 --- a/bindings/msvc/samples/main.c +++ b/bindings/msvc/samples/main.c @@ -22,7 +22,7 @@ // posix specific #else // _MSC_VER -#include "platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/bindings/msvc_native/unicorn/unicorn.vcxproj b/bindings/msvc_native/unicorn/unicorn.vcxproj index 1d7eab32..8b99c009 100644 --- a/bindings/msvc_native/unicorn/unicorn.vcxproj +++ b/bindings/msvc_native/unicorn/unicorn.vcxproj @@ -63,13 +63,13 @@ - + diff --git a/bindings/msvc_native/unicorn/unicorn.vcxproj.filters b/bindings/msvc_native/unicorn/unicorn.vcxproj.filters index b9537f69..82f63f0d 100644 --- a/bindings/msvc_native/unicorn/unicorn.vcxproj.filters +++ b/bindings/msvc_native/unicorn/unicorn.vcxproj.filters @@ -493,8 +493,6 @@ - - priv - + \ No newline at end of file diff --git a/include/list.h b/include/list.h index 9731ca3a..67734cc8 100644 --- a/include/list.h +++ b/include/list.h @@ -1,7 +1,7 @@ #ifndef UC_LLIST_H #define UC_LLIST_H -#include "platform.h" +#include "unicorn/platform.h" struct list_item { struct list_item *next; diff --git a/include/uc_priv.h b/include/uc_priv.h index f8b7cded..4251b06b 100644 --- a/include/uc_priv.h +++ b/include/uc_priv.h @@ -4,7 +4,7 @@ #ifndef UC_PRIV_H #define UC_PRIV_H -#include "platform.h" +#include "unicorn/platform.h" #include #include "qemu.h" diff --git a/include/unicorn/m68k.h b/include/unicorn/m68k.h index a2a02fab..97c5575c 100644 --- a/include/unicorn/m68k.h +++ b/include/unicorn/m68k.h @@ -8,7 +8,7 @@ extern "C" { #endif -#include "platform.h" +#include "unicorn/platform.h" #ifdef _MSC_VER #pragma warning(disable:4201) diff --git a/include/unicorn/sparc.h b/include/unicorn/sparc.h index 7be29ab5..ca607709 100644 --- a/include/unicorn/sparc.h +++ b/include/unicorn/sparc.h @@ -8,7 +8,7 @@ extern "C" { #endif -#include "platform.h" +#include "unicorn/platform.h" // GCC SPARC toolchain has a default macro called "sparc" which breaks // compilation diff --git a/include/unicorn/unicorn.h b/include/unicorn/unicorn.h index 961742fe..2b5c4502 100644 --- a/include/unicorn/unicorn.h +++ b/include/unicorn/unicorn.h @@ -12,7 +12,7 @@ extern "C" { #pragma comment(lib, "unicorn.lib") #endif -#include "platform.h" +#include "unicorn/platform.h" #include #if defined(UNICORN_HAS_OSXKERNEL) #include diff --git a/include/unicorn/x86.h b/include/unicorn/x86.h index e4c6fd43..3a339d33 100644 --- a/include/unicorn/x86.h +++ b/include/unicorn/x86.h @@ -8,7 +8,7 @@ extern "C" { #endif -#include "platform.h" +#include "unicorn/platform.h" // Memory-Management Register for instructions IDTR, GDTR, LDTR, TR. // Borrow from SegmentCache in qemu/target-i386/cpu.h diff --git a/list.c b/list.c index c58cf163..69a66491 100644 --- a/list.c +++ b/list.c @@ -1,5 +1,5 @@ #include -#include "platform.h" +#include "unicorn/platform.h" #include "list.h" // simple linked list implementation diff --git a/qemu/include/elf.h b/qemu/include/elf.h index d9d6ebe6..4046d913 100644 --- a/qemu/include/elf.h +++ b/qemu/include/elf.h @@ -1,7 +1,7 @@ #ifndef _QEMU_ELF_H #define _QEMU_ELF_H -#include "platform.h" +#include "unicorn/platform.h" /* 32-bit ELF base types. */ typedef uint32_t Elf32_Addr; diff --git a/qemu/include/exec/cpu-defs.h b/qemu/include/exec/cpu-defs.h index 2396e751..2d19f2a8 100644 --- a/qemu/include/exec/cpu-defs.h +++ b/qemu/include/exec/cpu-defs.h @@ -24,7 +24,7 @@ #endif #include "config.h" -#include "platform.h" +#include "unicorn/platform.h" #include "qemu/osdep.h" #include "qemu/queue.h" #ifndef CONFIG_USER_ONLY diff --git a/qemu/include/exec/hwaddr.h b/qemu/include/exec/hwaddr.h index 0cfb0d24..8ac83941 100644 --- a/qemu/include/exec/hwaddr.h +++ b/qemu/include/exec/hwaddr.h @@ -7,7 +7,7 @@ /* hwaddr is the type of a physical address (its size can be different from 'target_ulong'). */ -#include "platform.h" +#include "unicorn/platform.h" typedef uint64_t hwaddr; #define HWADDR_MAX UINT64_MAX diff --git a/qemu/include/exec/memory.h b/qemu/include/exec/memory.h index 8348b979..b86f684a 100644 --- a/qemu/include/exec/memory.h +++ b/qemu/include/exec/memory.h @@ -19,7 +19,7 @@ #define DIRTY_MEMORY_CODE 0 #define DIRTY_MEMORY_NUM 1 /* num of dirty bits */ -#include "platform.h" +#include "unicorn/platform.h" #include "qemu-common.h" #include "exec/cpu-common.h" #ifndef CONFIG_USER_ONLY diff --git a/qemu/include/fpu/softfloat.h b/qemu/include/fpu/softfloat.h index 982c4e06..692f8d3f 100644 --- a/qemu/include/fpu/softfloat.h +++ b/qemu/include/fpu/softfloat.h @@ -42,7 +42,7 @@ these four paragraphs for those parts of this code that are retained. #include #endif -#include "platform.h" +#include "unicorn/platform.h" #include "config-host.h" #include "qemu/osdep.h" diff --git a/qemu/include/glib_compat.h b/qemu/include/glib_compat.h index 191fb864..2d627ed2 100644 --- a/qemu/include/glib_compat.h +++ b/qemu/include/glib_compat.h @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifndef __GLIB_COMPAT_H #define __GLIB_COMPAT_H -#include "platform.h" +#include "unicorn/platform.h" #include #include #include diff --git a/qemu/include/qapi/error.h b/qemu/include/qapi/error.h index 3b014053..fc1cec66 100644 --- a/qemu/include/qapi/error.h +++ b/qemu/include/qapi/error.h @@ -14,7 +14,7 @@ #include "qemu/compiler.h" #include "qapi-types.h" -#include "platform.h" +#include "unicorn/platform.h" /** * A class representing internal errors within QEMU. An error has a ErrorClass diff --git a/qemu/include/qapi/qmp/qbool.h b/qemu/include/qapi/qmp/qbool.h index 9a9823c2..5304dc5e 100644 --- a/qemu/include/qapi/qmp/qbool.h +++ b/qemu/include/qapi/qmp/qbool.h @@ -14,7 +14,7 @@ #ifndef QBOOL_H #define QBOOL_H -#include "platform.h" +#include "unicorn/platform.h" #include "qapi/qmp/qobject.h" typedef struct QBool { diff --git a/qemu/include/qapi/qmp/qdict.h b/qemu/include/qapi/qmp/qdict.h index 392ce3d8..567c02f4 100644 --- a/qemu/include/qapi/qmp/qdict.h +++ b/qemu/include/qapi/qmp/qdict.h @@ -16,7 +16,7 @@ #include "qapi/qmp/qobject.h" #include "qapi/qmp/qlist.h" #include "qemu/queue.h" -#include "platform.h" +#include "unicorn/platform.h" #define QDICT_BUCKET_MAX 512 diff --git a/qemu/include/qapi/qmp/qfloat.h b/qemu/include/qapi/qmp/qfloat.h index 775b86ec..b068ed3f 100644 --- a/qemu/include/qapi/qmp/qfloat.h +++ b/qemu/include/qapi/qmp/qfloat.h @@ -14,7 +14,7 @@ #ifndef QFLOAT_H #define QFLOAT_H -#include "platform.h" +#include "unicorn/platform.h" #include "qapi/qmp/qobject.h" typedef struct QFloat { diff --git a/qemu/include/qapi/qmp/qint.h b/qemu/include/qapi/qmp/qint.h index 723fd55c..0150b7e4 100644 --- a/qemu/include/qapi/qmp/qint.h +++ b/qemu/include/qapi/qmp/qint.h @@ -13,7 +13,7 @@ #ifndef QINT_H #define QINT_H -#include "platform.h" +#include "unicorn/platform.h" #include "qapi/qmp/qobject.h" typedef struct QInt { diff --git a/qemu/include/qapi/qmp/qstring.h b/qemu/include/qapi/qmp/qstring.h index e24325e9..734e9127 100644 --- a/qemu/include/qapi/qmp/qstring.h +++ b/qemu/include/qapi/qmp/qstring.h @@ -13,7 +13,7 @@ #ifndef QSTRING_H #define QSTRING_H -#include "platform.h" +#include "unicorn/platform.h" #include "qapi/qmp/qobject.h" typedef struct QString { diff --git a/qemu/include/qemu-common.h b/qemu/include/qemu-common.h index 66126029..195dccf2 100644 --- a/qemu/include/qemu-common.h +++ b/qemu/include/qemu-common.h @@ -27,7 +27,7 @@ #include #include #include -#include "platform.h" +#include "unicorn/platform.h" #include #include #include diff --git a/qemu/include/qemu/bitops.h b/qemu/include/qemu/bitops.h index 792d03ad..bbd1413e 100644 --- a/qemu/include/qemu/bitops.h +++ b/qemu/include/qemu/bitops.h @@ -12,7 +12,7 @@ #ifndef BITOPS_H #define BITOPS_H -#include "platform.h" +#include "unicorn/platform.h" #include #include "host-utils.h" diff --git a/qemu/include/qemu/bswap.h b/qemu/include/qemu/bswap.h index 64a3e170..9d069d05 100644 --- a/qemu/include/qemu/bswap.h +++ b/qemu/include/qemu/bswap.h @@ -2,7 +2,7 @@ #define BSWAP_H #include "config-host.h" -#include "platform.h" +#include "unicorn/platform.h" #include #include #include "fpu/softfloat.h" diff --git a/qemu/include/qemu/int128.h b/qemu/include/qemu/int128.h index cf4e6fb0..4fad1354 100644 --- a/qemu/include/qemu/int128.h +++ b/qemu/include/qemu/int128.h @@ -2,7 +2,7 @@ #define INT128_H //#include -#include "platform.h" +#include "unicorn/platform.h" typedef struct Int128 Int128; diff --git a/qemu/include/qemu/log.h b/qemu/include/qemu/log.h index e9d34f5e..6f9ccdf7 100644 --- a/qemu/include/qemu/log.h +++ b/qemu/include/qemu/log.h @@ -2,7 +2,7 @@ #define QEMU_LOG_H #include -#include "platform.h" +#include "unicorn/platform.h" #include "qemu/compiler.h" #include "qom/cpu.h" diff --git a/qemu/include/qemu/osdep.h b/qemu/include/qemu/osdep.h index 4536341a..3c77fcfb 100644 --- a/qemu/include/qemu/osdep.h +++ b/qemu/include/qemu/osdep.h @@ -4,7 +4,7 @@ #include "config-host.h" #include #include -#include "platform.h" +#include "unicorn/platform.h" #include #ifdef __OpenBSD__ #include @@ -17,7 +17,7 @@ #define WEXITSTATUS(x) (x) #endif -#include "platform.h" +#include "unicorn/platform.h" #if defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10 /* [u]int_fast*_t not in */ diff --git a/qemu/include/qemu/range.h b/qemu/include/qemu/range.h index 7d6c9f2b..f5b1c5f3 100644 --- a/qemu/include/qemu/range.h +++ b/qemu/include/qemu/range.h @@ -1,7 +1,7 @@ #ifndef QEMU_RANGE_H #define QEMU_RANGE_H -#include "platform.h" +#include "unicorn/platform.h" #include #include "qemu/queue.h" diff --git a/qemu/include/qemu/thread.h b/qemu/include/qemu/thread.h index b6ba6383..c5d25f61 100644 --- a/qemu/include/qemu/thread.h +++ b/qemu/include/qemu/thread.h @@ -1,7 +1,7 @@ #ifndef __QEMU_THREAD_H #define __QEMU_THREAD_H 1 -#include "platform.h" +#include "unicorn/platform.h" typedef struct QemuThread QemuThread; diff --git a/qemu/include/qom/object.h b/qemu/include/qom/object.h index b18a2b7f..4451c7cf 100644 --- a/qemu/include/qom/object.h +++ b/qemu/include/qom/object.h @@ -15,7 +15,7 @@ #define QEMU_OBJECT_H #include "glib_compat.h" -#include "platform.h" +#include "unicorn/platform.h" #include "qemu/queue.h" #include "qapi/error.h" diff --git a/qemu/target-arm/arm-semi.c b/qemu/target-arm/arm-semi.c index d8f3816f..fa7d8906 100644 --- a/qemu/target-arm/arm-semi.c +++ b/qemu/target-arm/arm-semi.c @@ -21,7 +21,7 @@ #include #include #include -#include "platform.h" +#include "unicorn/platform.h" #include #include #include diff --git a/qemu/target-arm/translate-a64.c b/qemu/target-arm/translate-a64.c index 334b47a1..017d170e 100644 --- a/qemu/target-arm/translate-a64.c +++ b/qemu/target-arm/translate-a64.c @@ -20,7 +20,7 @@ #include #include #include -#include "platform.h" +#include "unicorn/platform.h" #include "cpu.h" #include "tcg-op.h" diff --git a/qemu/target-arm/translate.c b/qemu/target-arm/translate.c index 020bc717..a66ebf65 100644 --- a/qemu/target-arm/translate.c +++ b/qemu/target-arm/translate.c @@ -23,7 +23,7 @@ #include #include #include -#include "platform.h" +#include "unicorn/platform.h" #include "cpu.h" #include "internals.h" diff --git a/qemu/target-i386/cpu.c b/qemu/target-i386/cpu.c index bb966d62..1c8bf86b 100644 --- a/qemu/target-i386/cpu.c +++ b/qemu/target-i386/cpu.c @@ -19,7 +19,7 @@ #include #include #include -#include "platform.h" +#include "unicorn/platform.h" #include "cpu.h" #include "sysemu/cpus.h" diff --git a/qemu/target-i386/topology.h b/qemu/target-i386/topology.h index 87f1820d..e18ddfbe 100644 --- a/qemu/target-i386/topology.h +++ b/qemu/target-i386/topology.h @@ -38,7 +38,7 @@ * CPUID Fn8000_0008_ECX[ApicIdCoreIdSize[3:0]] is set to apicid_core_width(). */ -#include "platform.h" +#include "unicorn/platform.h" #include #include "qemu/bitops.h" diff --git a/qemu/target-i386/translate.c b/qemu/target-i386/translate.c index 4792a697..b1f254b2 100644 --- a/qemu/target-i386/translate.c +++ b/qemu/target-i386/translate.c @@ -20,7 +20,7 @@ #include #include #include -#include "platform.h" +#include "unicorn/platform.h" #include #include "qemu/host-utils.h" diff --git a/qemu/target-m68k/m68k-semi.c b/qemu/target-m68k/m68k-semi.c index 4087c6d5..7b2b25d7 100644 --- a/qemu/target-m68k/m68k-semi.c +++ b/qemu/target-m68k/m68k-semi.c @@ -21,7 +21,7 @@ #include #include #include -#include "platform.h" +#include "unicorn/platform.h" #include #include #include diff --git a/qemu/target-mips/helper.c b/qemu/target-mips/helper.c index 4dba9ff7..607b3f21 100644 --- a/qemu/target-mips/helper.c +++ b/qemu/target-mips/helper.c @@ -20,7 +20,7 @@ #include #include #include -#include "platform.h" +#include "unicorn/platform.h" #include #include "cpu.h" diff --git a/qemu/target-sparc/translate.c b/qemu/target-sparc/translate.c index b974fa21..4a6fabe7 100644 --- a/qemu/target-sparc/translate.c +++ b/qemu/target-sparc/translate.c @@ -22,7 +22,7 @@ #include #include #include -#include "platform.h" +#include "unicorn/platform.h" #include "cpu.h" #include "exec/helper-proto.h" diff --git a/qemu/tcg-runtime.c b/qemu/tcg-runtime.c index b9935910..21b022a5 100644 --- a/qemu/tcg-runtime.c +++ b/qemu/tcg-runtime.c @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "platform.h" +#include "unicorn/platform.h" #include "qemu/host-utils.h" /* This file is compiled once, and thus we can't include the standard diff --git a/qemu/translate-all.c b/qemu/translate-all.c index 857db5b0..f9e8e9ff 100644 --- a/qemu/translate-all.c +++ b/qemu/translate-all.c @@ -29,7 +29,7 @@ #include #include #include -#include "platform.h" +#include "unicorn/platform.h" #include "config.h" diff --git a/qemu/util/host-utils.c b/qemu/util/host-utils.c index 88fa1714..5f1d7a79 100644 --- a/qemu/util/host-utils.c +++ b/qemu/util/host-utils.c @@ -24,7 +24,7 @@ */ #include -#include "platform.h" +#include "unicorn/platform.h" #include "qemu/host-utils.h" #ifndef CONFIG_INT128 diff --git a/qemu/util/oslib-posix.c b/qemu/util/oslib-posix.c index 4e9410ac..09f337b8 100644 --- a/qemu/util/oslib-posix.c +++ b/qemu/util/oslib-posix.c @@ -39,7 +39,7 @@ #endif #define HUGETLBFS_MAGIC 0x958458f6 -#include "platform.h" +#include "unicorn/platform.h" #include "config-host.h" #include "sysemu/sysemu.h" diff --git a/qemu/util/qemu-thread-posix.c b/qemu/util/qemu-thread-posix.c index c3525825..c4611443 100644 --- a/qemu/util/qemu-thread-posix.c +++ b/qemu/util/qemu-thread-posix.c @@ -15,7 +15,7 @@ #include #include #include -#include "platform.h" +#include "unicorn/platform.h" #include #include #ifdef __linux__ diff --git a/samples/mem_apis.c b/samples/mem_apis.c index 4680da70..c9028a97 100644 --- a/samples/mem_apis.c +++ b/samples/mem_apis.c @@ -38,8 +38,8 @@ // posix specific includes #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/samples/sample_arm.c b/samples/sample_arm.c index 0b1366a0..2e4dca3d 100644 --- a/samples/sample_arm.c +++ b/samples/sample_arm.c @@ -21,8 +21,8 @@ // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/samples/sample_arm64.c b/samples/sample_arm64.c index e0abc87e..5714d9ea 100644 --- a/samples/sample_arm64.c +++ b/samples/sample_arm64.c @@ -21,8 +21,8 @@ // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/samples/sample_batch_reg.c b/samples/sample_batch_reg.c index 2009738d..5d3d55d2 100644 --- a/samples/sample_batch_reg.c +++ b/samples/sample_batch_reg.c @@ -1,4 +1,4 @@ -#include "platform.h" +#include "unicorn/platform.h" #include #include #include diff --git a/samples/sample_m68k.c b/samples/sample_m68k.c index 61fbb146..9b726d84 100644 --- a/samples/sample_m68k.c +++ b/samples/sample_m68k.c @@ -21,8 +21,8 @@ // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/samples/sample_mips.c b/samples/sample_mips.c index 0c074c72..f093f625 100644 --- a/samples/sample_mips.c +++ b/samples/sample_mips.c @@ -21,8 +21,8 @@ // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/samples/sample_sparc.c b/samples/sample_sparc.c index aa80edbb..9b0bfc21 100644 --- a/samples/sample_sparc.c +++ b/samples/sample_sparc.c @@ -21,8 +21,8 @@ // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/samples/sample_x86_32_gdt_and_seg_regs.c b/samples/sample_x86_32_gdt_and_seg_regs.c index 794ee99d..42851d4a 100644 --- a/samples/sample_x86_32_gdt_and_seg_regs.c +++ b/samples/sample_x86_32_gdt_and_seg_regs.c @@ -20,11 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include -#include "platform.h" +#include "unicorn/platform.h" #include #include #include -#include "platform.h" +#include "unicorn/platform.h" #pragma pack(push, 1) struct SegmentDescriptor { diff --git a/samples/shellcode.c b/samples/shellcode.c index c9f34cd8..9de4f977 100644 --- a/samples/shellcode.c +++ b/samples/shellcode.c @@ -21,8 +21,8 @@ // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/tests/regress/block_test.c b/tests/regress/block_test.c index 7071d674..3b8c270e 100644 --- a/tests/regress/block_test.c +++ b/tests/regress/block_test.c @@ -1,8 +1,8 @@ #include -#include "platform.h" +#include "unicorn/platform.h" #include #include -#include "platform.h" +#include "unicorn/platform.h" #include diff --git a/tests/regress/eflags_noset.c b/tests/regress/eflags_noset.c index 0914436a..bcaf6fe9 100644 --- a/tests/regress/eflags_noset.c +++ b/tests/regress/eflags_noset.c @@ -1,6 +1,6 @@ #include #include -#include "platform.h" +#include "unicorn/platform.h" #include #include diff --git a/tests/regress/eflags_nosync.c b/tests/regress/eflags_nosync.c index bf3dc729..ae7cae10 100644 --- a/tests/regress/eflags_nosync.c +++ b/tests/regress/eflags_nosync.c @@ -1,4 +1,4 @@ -#include "platform.h" +#include "unicorn/platform.h" #include #include #include diff --git a/tests/regress/emu_clear_errors.c b/tests/regress/emu_clear_errors.c index 4ee08654..dccac5b9 100644 --- a/tests/regress/emu_clear_errors.c +++ b/tests/regress/emu_clear_errors.c @@ -1,8 +1,8 @@ #include -#include "platform.h" +#include "unicorn/platform.h" #include #include -#include "platform.h" +#include "unicorn/platform.h" #include diff --git a/tests/regress/emu_stop_in_hook_overrun.c b/tests/regress/emu_stop_in_hook_overrun.c index ea419ca6..1ec4953a 100644 --- a/tests/regress/emu_stop_in_hook_overrun.c +++ b/tests/regress/emu_stop_in_hook_overrun.c @@ -22,8 +22,8 @@ Test for uc_emu_stop() in code hook not always stopping the emu at the current i // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #include "pthread.h" #endif // _MSC_VER diff --git a/tests/regress/hook_extrainvoke.c b/tests/regress/hook_extrainvoke.c index 5281361c..2f595a37 100644 --- a/tests/regress/hook_extrainvoke.c +++ b/tests/regress/hook_extrainvoke.c @@ -1,6 +1,6 @@ #include #include -#include "platform.h" +#include "unicorn/platform.h" #include diff --git a/tests/regress/invalid_read_in_cpu_tb_exec.c b/tests/regress/invalid_read_in_cpu_tb_exec.c index b621fdf9..6a7d4843 100644 --- a/tests/regress/invalid_read_in_cpu_tb_exec.c +++ b/tests/regress/invalid_read_in_cpu_tb_exec.c @@ -1,4 +1,4 @@ -#include "platform.h" +#include "unicorn/platform.h" #include static void hook_block(uc_engine *uc, uint64_t address, uint32_t size, void *user_data) { diff --git a/tests/regress/mem_64_c.c b/tests/regress/mem_64_c.c index e78b1af2..5c3f4d91 100644 --- a/tests/regress/mem_64_c.c +++ b/tests/regress/mem_64_c.c @@ -1,5 +1,5 @@ #include -#include "platform.h" +#include "unicorn/platform.h" #include uint64_t starts[] = {0x10000000, 0x110004000ll}; diff --git a/tests/regress/mem_double_unmap.c b/tests/regress/mem_double_unmap.c index 6eae6e28..b97a209a 100644 --- a/tests/regress/mem_double_unmap.c +++ b/tests/regress/mem_double_unmap.c @@ -1,7 +1,7 @@ #define __STDC_FORMAT_MACROS -#include "platform.h" +#include "unicorn/platform.h" #include -#include "platform.h" +#include "unicorn/platform.h" #include #include #include diff --git a/tests/regress/mem_exec.c b/tests/regress/mem_exec.c index 546aab0d..c86920a1 100644 --- a/tests/regress/mem_exec.c +++ b/tests/regress/mem_exec.c @@ -19,9 +19,9 @@ */ #define __STDC_FORMAT_MACROS -#include "platform.h" +#include "unicorn/platform.h" #include -#include "platform.h" +#include "unicorn/platform.h" #include #include #include diff --git a/tests/regress/mem_fuzz.c b/tests/regress/mem_fuzz.c index 43d02f91..b0096a7e 100644 --- a/tests/regress/mem_fuzz.c +++ b/tests/regress/mem_fuzz.c @@ -1,7 +1,7 @@ #define __STDC_FORMAT_MACROS -#include "platform.h" +#include "unicorn/platform.h" #include -#include "platform.h" +#include "unicorn/platform.h" #include #include #include diff --git a/tests/regress/mem_nofree.c b/tests/regress/mem_nofree.c index 8008c3d8..7c10e851 100644 --- a/tests/regress/mem_nofree.c +++ b/tests/regress/mem_nofree.c @@ -1,6 +1,6 @@ #include #include -#include "platform.h" +#include "unicorn/platform.h" #include diff --git a/tests/regress/mem_protect.c b/tests/regress/mem_protect.c index fe916af1..598446ca 100644 --- a/tests/regress/mem_protect.c +++ b/tests/regress/mem_protect.c @@ -19,9 +19,9 @@ */ #define __STDC_FORMAT_MACROS -#include "platform.h" +#include "unicorn/platform.h" #include -#include "platform.h" +#include "unicorn/platform.h" #include #include #include diff --git a/tests/regress/mem_unmap.c b/tests/regress/mem_unmap.c index 8aa2c60a..b37bac3d 100644 --- a/tests/regress/mem_unmap.c +++ b/tests/regress/mem_unmap.c @@ -20,9 +20,9 @@ */ #define __STDC_FORMAT_MACROS -#include "platform.h" +#include "unicorn/platform.h" #include -#include "platform.h" +#include "unicorn/platform.h" #include #include #include diff --git a/tests/regress/memleak_arm.c b/tests/regress/memleak_arm.c index 91d1e16d..88b73f80 100644 --- a/tests/regress/memleak_arm.c +++ b/tests/regress/memleak_arm.c @@ -21,8 +21,8 @@ // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/tests/regress/memleak_arm64.c b/tests/regress/memleak_arm64.c index f3eeb1ce..df56c44f 100644 --- a/tests/regress/memleak_arm64.c +++ b/tests/regress/memleak_arm64.c @@ -21,8 +21,8 @@ // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/tests/regress/memleak_m68k.c b/tests/regress/memleak_m68k.c index 6ddd2612..ed22e3a6 100644 --- a/tests/regress/memleak_m68k.c +++ b/tests/regress/memleak_m68k.c @@ -21,8 +21,8 @@ // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/tests/regress/memleak_mips.c b/tests/regress/memleak_mips.c index 91866d4b..0b47955d 100644 --- a/tests/regress/memleak_mips.c +++ b/tests/regress/memleak_mips.c @@ -21,8 +21,8 @@ // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/tests/regress/memleak_sparc.c b/tests/regress/memleak_sparc.c index c45f71fd..8f3628b7 100644 --- a/tests/regress/memleak_sparc.c +++ b/tests/regress/memleak_sparc.c @@ -21,8 +21,8 @@ // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/tests/regress/memleak_x86.c b/tests/regress/memleak_x86.c index 14bc116b..8328fa96 100644 --- a/tests/regress/memleak_x86.c +++ b/tests/regress/memleak_x86.c @@ -21,8 +21,8 @@ // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/tests/regress/mips_branch_likely_issue.c b/tests/regress/mips_branch_likely_issue.c index ee0323ce..d1b2fe57 100644 --- a/tests/regress/mips_branch_likely_issue.c +++ b/tests/regress/mips_branch_likely_issue.c @@ -22,8 +22,8 @@ // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #include "pthread.h" #endif // _MSC_VER diff --git a/tests/regress/mips_delay_slot_code_hook.c b/tests/regress/mips_delay_slot_code_hook.c index 6164ae34..9c992607 100644 --- a/tests/regress/mips_delay_slot_code_hook.c +++ b/tests/regress/mips_delay_slot_code_hook.c @@ -27,8 +27,8 @@ but that the code hook is just not occurring. // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #endif // _MSC_VER diff --git a/tests/regress/nr_mem_test.c b/tests/regress/nr_mem_test.c index 55edc733..3279d87d 100644 --- a/tests/regress/nr_mem_test.c +++ b/tests/regress/nr_mem_test.c @@ -18,9 +18,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "platform.h" +#include "unicorn/platform.h" #include -#include "platform.h" +#include "unicorn/platform.h" #include diff --git a/tests/regress/rep_movsb.c b/tests/regress/rep_movsb.c index 8ce997a7..e96cae49 100644 --- a/tests/regress/rep_movsb.c +++ b/tests/regress/rep_movsb.c @@ -20,9 +20,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #define __STDC_FORMAT_MACROS -#include "platform.h" +#include "unicorn/platform.h" #include -#include "platform.h" +#include "unicorn/platform.h" #include #include #include diff --git a/tests/regress/ro_mem_test.c b/tests/regress/ro_mem_test.c index f1117a4d..8d73bf58 100644 --- a/tests/regress/ro_mem_test.c +++ b/tests/regress/ro_mem_test.c @@ -18,9 +18,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "platform.h" +#include "unicorn/platform.h" #include -#include "platform.h" +#include "unicorn/platform.h" #include diff --git a/tests/regress/rw_hookstack.c b/tests/regress/rw_hookstack.c index 84a03c67..39d2b2f2 100644 --- a/tests/regress/rw_hookstack.c +++ b/tests/regress/rw_hookstack.c @@ -1,6 +1,6 @@ #include #include -#include "platform.h" +#include "unicorn/platform.h" #include #define ADDRESS 0x1000000 diff --git a/tests/regress/threaded_emu_start.c b/tests/regress/threaded_emu_start.c index 2d3692be..504763fd 100644 --- a/tests/regress/threaded_emu_start.c +++ b/tests/regress/threaded_emu_start.c @@ -33,8 +33,8 @@ background. // posix specific #else // _MSC_VER -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #include "pthread.h" #endif // _MSC_VER diff --git a/tests/regress/timeout_segfault.c b/tests/regress/timeout_segfault.c index 07cbb41d..48e55d13 100644 --- a/tests/regress/timeout_segfault.c +++ b/tests/regress/timeout_segfault.c @@ -9,7 +9,7 @@ call to uc_emu_start(). See issue #78 for more details: https://github.com/unicorn-engine/unicorn/issues/78 */ -#include "platform.h" +#include "unicorn/platform.h" #include diff --git a/tests/unit/test_gdt_idt_x86.c b/tests/unit/test_gdt_idt_x86.c index f3a906c2..6772aa64 100644 --- a/tests/unit/test_gdt_idt_x86.c +++ b/tests/unit/test_gdt_idt_x86.c @@ -1,9 +1,9 @@ #include -#include "platform.h" +#include "unicorn/platform.h" #include #include #include -#include "platform.h" +#include "unicorn/platform.h" /** * Assert that err matches expect diff --git a/tests/unit/test_hang.c b/tests/unit/test_hang.c index 8183dbf2..8589573d 100644 --- a/tests/unit/test_hang.c +++ b/tests/unit/test_hang.c @@ -5,7 +5,7 @@ #include "unicorn_test.h" #include -#include "platform.h" +#include "unicorn/platform.h" uint64_t trunc_page(uint64_t addr) { diff --git a/tests/unit/test_hookcounts.c b/tests/unit/test_hookcounts.c index 127be64e..327095a9 100644 --- a/tests/unit/test_hookcounts.c +++ b/tests/unit/test_hookcounts.c @@ -4,7 +4,7 @@ // emulation by counts of instruction code // #include "unicorn_test.h" -#include "platform.h" +#include "unicorn/platform.h" #define DEBUG 1 diff --git a/tests/unit/test_mem_high.c b/tests/unit/test_mem_high.c index b0c9f9cd..dfa88207 100644 --- a/tests/unit/test_mem_high.c +++ b/tests/unit/test_mem_high.c @@ -7,7 +7,7 @@ #include "unicorn_test.h" #include #include -#include "platform.h" +#include "unicorn/platform.h" /* Called before every test to set up a new instance */ static int setup(void **state) diff --git a/tests/unit/test_multihook.c b/tests/unit/test_multihook.c index 8eef231a..0f69b35b 100644 --- a/tests/unit/test_multihook.c +++ b/tests/unit/test_multihook.c @@ -1,5 +1,5 @@ #include "unicorn_test.h" -#include "platform.h" +#include "unicorn/platform.h" #define OK(x) uc_assert_success(x) diff --git a/tests/unit/test_pc_change.c b/tests/unit/test_pc_change.c index a77e7441..1f04fd35 100644 --- a/tests/unit/test_pc_change.c +++ b/tests/unit/test_pc_change.c @@ -1,6 +1,6 @@ // Test PC change during the callback. by Nguyen Anh Quynh, 2016 #include "unicorn_test.h" -#include "platform.h" +#include "unicorn/platform.h" #define OK(x) uc_assert_success(x) diff --git a/tests/unit/test_tb_x86.c b/tests/unit/test_tb_x86.c index 77cf9260..675a3925 100644 --- a/tests/unit/test_tb_x86.c +++ b/tests/unit/test_tb_x86.c @@ -8,7 +8,7 @@ #include #include #include -#include "platform.h" +#include "unicorn/platform.h" #define RIP_NEXT_TO_THE_SELFMODIFY_OPCODE (1) diff --git a/tests/unit/test_x86.c b/tests/unit/test_x86.c index adfdbf2c..85a7da41 100644 --- a/tests/unit/test_x86.c +++ b/tests/unit/test_x86.c @@ -1,5 +1,5 @@ #include "unicorn_test.h" -#include "platform.h" +#include "unicorn/platform.h" #define OK(x) uc_assert_success(x) diff --git a/tests/unit/test_x86_rip_bug.c b/tests/unit/test_x86_rip_bug.c index 38a2c25d..b3e31a32 100644 --- a/tests/unit/test_x86_rip_bug.c +++ b/tests/unit/test_x86_rip_bug.c @@ -1,5 +1,5 @@ -#include "platform.h" -#include "platform.h" +#include "unicorn/platform.h" +#include "unicorn/platform.h" #include #include "unicorn_test.h" diff --git a/tests/unit/test_x86_shl_enter_leave.c b/tests/unit/test_x86_shl_enter_leave.c index 65c73c12..d53d0482 100644 --- a/tests/unit/test_x86_shl_enter_leave.c +++ b/tests/unit/test_x86_shl_enter_leave.c @@ -1,4 +1,4 @@ -#include "platform.h" +#include "unicorn/platform.h" #include #include "unicorn_test.h" diff --git a/tests/unit/test_x86_soft_paging.c b/tests/unit/test_x86_soft_paging.c index 1722fd8c..6b303588 100644 --- a/tests/unit/test_x86_soft_paging.c +++ b/tests/unit/test_x86_soft_paging.c @@ -1,5 +1,5 @@ #include "unicorn_test.h" -#include "platform.h" +#include "unicorn/platform.h" /* Two tests here for software paging