diff --git a/samples/mem_apis.c b/samples/mem_apis.c index c47792af..2ffdf6c3 100644 --- a/samples/mem_apis.c +++ b/samples/mem_apis.c @@ -20,27 +20,7 @@ #define __STDC_FORMAT_MACROS -<<<<<<< HEAD -======= -// windows specific includes -#ifdef _MSC_VER -#include -#include -#define PRIx64 "llX" -#ifdef DYNLOAD -#include "unicorn_dynload.h" -#else // DYNLOAD -#include -#ifdef _WIN64 -#pragma comment(lib, "unicorn_staload64.lib") -#else // _WIN64 -#pragma comment(lib, "unicorn_staload.lib") -#endif // _WIN64 -#endif // DYNLOAD -// posix specific includes -#else // _MSC_VER ->>>>>>> unicorn-engine/msvc #include #include #include diff --git a/samples/sample_arm.c b/samples/sample_arm.c index 567cf6d2..1e142c13 100644 --- a/samples/sample_arm.c +++ b/samples/sample_arm.c @@ -3,27 +3,6 @@ /* Sample code to demonstrate how to emulate ARM code */ -<<<<<<< HEAD -======= -// windows specific -#ifdef _MSC_VER -#include -#include -#define PRIx64 "llX" -#ifdef DYNLOAD -#include "unicorn_dynload.h" -#else // DYNLOAD -#include -#ifdef _WIN64 -#pragma comment(lib, "unicorn_staload64.lib") -#else // _WIN64 -#pragma comment(lib, "unicorn_staload.lib") -#endif // _WIN64 -#endif // DYNLOAD - -// posix specific -#else // _MSC_VER ->>>>>>> unicorn-engine/msvc #include #include diff --git a/samples/sample_arm64.c b/samples/sample_arm64.c index 5d738099..149928ac 100644 --- a/samples/sample_arm64.c +++ b/samples/sample_arm64.c @@ -3,27 +3,6 @@ /* Sample code to demonstrate how to emulate ARM64 code */ -<<<<<<< HEAD -======= -// windows specific -#ifdef _MSC_VER -#include -#include -#define PRIx64 "llX" -#ifdef DYNLOAD -#include "unicorn_dynload.h" -#else // DYNLOAD -#include -#ifdef _WIN64 -#pragma comment(lib, "unicorn_staload64.lib") -#else // _WIN64 -#pragma comment(lib, "unicorn_staload.lib") -#endif // _WIN64 -#endif // DYNLOAD - -// posix specific -#else // _MSC_VER ->>>>>>> unicorn-engine/msvc #include #include diff --git a/samples/sample_batch_reg.c b/samples/sample_batch_reg.c index fd7767cf..322c939e 100644 --- a/samples/sample_batch_reg.c +++ b/samples/sample_batch_reg.c @@ -1,9 +1,3 @@ -<<<<<<< HEAD - -======= -#include -#include ->>>>>>> unicorn-engine/msvc #include #include #include diff --git a/samples/sample_m68k.c b/samples/sample_m68k.c index c05ccb73..26ac4c1b 100644 --- a/samples/sample_m68k.c +++ b/samples/sample_m68k.c @@ -3,27 +3,6 @@ /* Sample code to demonstrate how to emulate m68k code */ -<<<<<<< HEAD -======= -// windows specific -#ifdef _MSC_VER -#include -#include -#define PRIx64 "llX" -#ifdef DYNLOAD -#include "unicorn_dynload.h" -#else // DYNLOAD -#include -#ifdef _WIN64 -#pragma comment(lib, "unicorn_staload64.lib") -#else // _WIN64 -#pragma comment(lib, "unicorn_staload.lib") -#endif // _WIN64 -#endif // DYNLOAD - -// posix specific -#else // _MSC_VER ->>>>>>> unicorn-engine/msvc #include #include diff --git a/samples/sample_mips.c b/samples/sample_mips.c index 1f53ba71..b032ec05 100644 --- a/samples/sample_mips.c +++ b/samples/sample_mips.c @@ -3,27 +3,6 @@ /* Sample code to demonstrate how to emulate Mips code (big endian) */ -<<<<<<< HEAD -======= -// windows specific -#ifdef _MSC_VER -#include -#include -#define PRIx64 "llX" -#ifdef DYNLOAD -#include "unicorn_dynload.h" -#else // DYNLOAD -#include -#ifdef _WIN64 -#pragma comment(lib, "unicorn_staload64.lib") -#else // _WIN64 -#pragma comment(lib, "unicorn_staload.lib") -#endif // _WIN64 -#endif // DYNLOAD - -// posix specific -#else // _MSC_VER ->>>>>>> unicorn-engine/msvc #include #include diff --git a/samples/sample_sparc.c b/samples/sample_sparc.c index 9b905785..24d937b3 100644 --- a/samples/sample_sparc.c +++ b/samples/sample_sparc.c @@ -3,27 +3,6 @@ /* Sample code to demonstrate how to emulate Sparc code */ -<<<<<<< HEAD -======= -// windows specific -#ifdef _MSC_VER -#include -#include -#define PRIx64 "llX" -#ifdef DYNLOAD -#include "unicorn_dynload.h" -#else // DYNLOAD -#include -#ifdef _WIN64 -#pragma comment(lib, "unicorn_staload64.lib") -#else // _WIN64 -#pragma comment(lib, "unicorn_staload.lib") -#endif // _WIN64 -#endif // DYNLOAD - -// posix specific -#else // _MSC_VER ->>>>>>> unicorn-engine/msvc #include #include diff --git a/samples/sample_x86_32_gdt_and_seg_regs.c b/samples/sample_x86_32_gdt_and_seg_regs.c index e9041ab1..ebd14da0 100644 --- a/samples/sample_x86_32_gdt_and_seg_regs.c +++ b/samples/sample_x86_32_gdt_and_seg_regs.c @@ -20,18 +20,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include -<<<<<<< HEAD -======= -#include ->>>>>>> unicorn-engine/msvc #include #include #include -<<<<<<< HEAD -# -======= ->>>>>>> unicorn-engine/msvc #pragma pack(push, 1) struct SegmentDescriptor { union { diff --git a/samples/shellcode.c b/samples/shellcode.c index d93c56e8..dcf97437 100644 --- a/samples/shellcode.c +++ b/samples/shellcode.c @@ -3,27 +3,6 @@ /* Sample code to trace code with Linux code with syscall */ -<<<<<<< HEAD -======= -// windows specific -#ifdef _MSC_VER -#include -#include -#define PRIx64 "llX" -#ifdef DYNLOAD -#include "unicorn_dynload.h" -#else // DYNLOAD -#include -#ifdef _WIN64 -#pragma comment(lib, "unicorn_staload64.lib") -#else // _WIN64 -#pragma comment(lib, "unicorn_staload.lib") -#endif // _WIN64 -#endif // DYNLOAD - -// posix specific -#else // _MSC_VER ->>>>>>> unicorn-engine/msvc #include #include diff --git a/tests/regress/Makefile b/tests/regress/Makefile index 285daaa2..67c779df 100644 --- a/tests/regress/Makefile +++ b/tests/regress/Makefile @@ -1,4 +1,3 @@ -<<<<<<< Updated upstream CFLAGS += -Wall -Werror -I../../include LDLIBS += -L../../ -lm -lunicorn @@ -15,42 +14,6 @@ TESTS = $(TESTS_SOURCE:%.c=%) .PHONY: all clean test test: $(TESTS) -======= - -CFLAGS += -I../../include - -ifeq (MING,$(findstring MING,$(shell uname -s))) -LDFLAGS += ../../unicorn.lib $(shell pkg-config --libs glib-2.0) -lpthread -lm -else -LDFLAGS += ../../libunicorn.a $(shell pkg-config --libs glib-2.0) -lpthread -lm -endif - -TESTS = map_crash map_write -TESTS += sigill sigill2 -TESTS += block_test -TESTS += ro_mem_test nr_mem_test -TESTS += timeout_segfault -TESTS += rep_movsb -TESTS += mem_unmap -TESTS += mem_double_unmap -TESTS += mem_protect -TESTS += mem_exec -TESTS += mips_kseg0_1 -TESTS += eflags_nosync -TESTS += 00opcode_uc_crash -TESTS += eflags_noset -TESTS += mem_map_large -TESTS += invalid_read_in_cpu_tb_exec -TESTS += invalid_write_in_cpu_tb_exec_x86_64 -TESTS += x86_16_segfault -TESTS += mips_invalid_read_of_size_4_when_tracing -TESTS += invalid_read_in_tb_flush_x86_64 -TESTS += sparc_jump_to_zero -TESTS += mips_delay_slot_code_hook -TESTS += mem_nofree -TESTS += rw_hookstack -TESTS += threaded_emu_start ->>>>>>> Stashed changes all: $(TESTS) diff --git a/tests/regress/rw_hookstack.c b/tests/regress/rw_hookstack.c index 6941c6e5..73dcc64b 100644 --- a/tests/regress/rw_hookstack.c +++ b/tests/regress/rw_hookstack.c @@ -52,42 +52,26 @@ int main(int argc, char *argv[]) err = uc_mem_map(uc, ADDRESS, SIZE, UC_PROT_ALL); if(err != UC_ERR_OK) { printf("Failed to map memory %s\n", uc_strerror(err)); -<<<<<<< Updated upstream return 1; -======= - return 2; ->>>>>>> Stashed changes } err = uc_mem_write(uc, ADDRESS, CODE32, sizeof(CODE32) - 1); if(err != UC_ERR_OK) { printf("Failed to write to memory %s\n", uc_strerror(err)); -<<<<<<< Updated upstream return 1; -======= - return 3; ->>>>>>> Stashed changes } loop: err = uc_mem_map(uc, stkval, STACK_SIZE, UC_PROT_ALL); if(err != UC_ERR_OK) { printf("Failed to map memory %s\n", uc_strerror(err)); -<<<<<<< Updated upstream return 1; -======= - return 4; ->>>>>>> Stashed changes } err = uc_mem_write(uc, ESP, &val, sizeof(val)); if(err != UC_ERR_OK) { printf("Failed to write to memory %s\n", uc_strerror(err)); -<<<<<<< Updated upstream return 1; -======= - return 5; ->>>>>>> Stashed changes } @@ -101,11 +85,7 @@ loop: printf("Failed on uc_emu_start() with error returned %u: %s\n", err, uc_strerror(err)); uc_close(uc); -<<<<<<< Updated upstream return 1; -======= - return 6; ->>>>>>> Stashed changes } uc_reg_read(uc, UC_X86_REG_EAX, &EAX);