diff --git a/include/unicorn/unicorn.h b/include/unicorn/unicorn.h index 1ee78f3a..c057dcc9 100644 --- a/include/unicorn/unicorn.h +++ b/include/unicorn/unicorn.h @@ -65,7 +65,7 @@ typedef size_t uc_hook; #define UNICORN_DEPRECATED __declspec(deprecated) #else #pragma message( \ - "WARNING: You need to implement UNICORN_DEPRECATED for this compiler") + "WARNING: You need to implement UNICORN_DEPRECATED for this compiler") #define UNICORN_DEPRECATED #endif diff --git a/tests/regress/x86_vex b/tests/regress/x86_vex new file mode 100755 index 00000000..62d95ab8 Binary files /dev/null and b/tests/regress/x86_vex differ diff --git a/tests/unit/test_ctl.c b/tests/unit/test_ctl.c index 9e2b4a4d..3da761b5 100644 --- a/tests/unit/test_ctl.c +++ b/tests/unit/test_ctl.c @@ -428,21 +428,22 @@ static void test_noexec(void) OK(uc_close(uc)); } -TEST_LIST = {{"test_uc_ctl_mode", test_uc_ctl_mode}, - {"test_uc_ctl_page_size", test_uc_ctl_page_size}, - {"test_uc_ctl_arch", test_uc_ctl_arch}, - {"test_uc_ctl_time_out", test_uc_ctl_time_out}, - {"test_uc_ctl_exits", test_uc_ctl_exits}, - {"test_uc_ctl_tb_cache", test_uc_ctl_tb_cache}, +TEST_LIST = { + {"test_uc_ctl_mode", test_uc_ctl_mode}, + {"test_uc_ctl_page_size", test_uc_ctl_page_size}, + {"test_uc_ctl_arch", test_uc_ctl_arch}, + {"test_uc_ctl_time_out", test_uc_ctl_time_out}, + {"test_uc_ctl_exits", test_uc_ctl_exits}, + {"test_uc_ctl_tb_cache", test_uc_ctl_tb_cache}, #ifdef UNICORN_HAS_ARM - {"test_uc_ctl_change_page_size", test_uc_ctl_change_page_size}, - {"test_uc_ctl_arm_cpu", test_uc_ctl_arm_cpu}, + {"test_uc_ctl_change_page_size", test_uc_ctl_change_page_size}, + {"test_uc_ctl_arm_cpu", test_uc_ctl_arm_cpu}, #endif #ifdef UNICORN_HAS_ARM64 - {"test_uc_ctl_change_page_size_arm64", test_uc_ctl_change_page_size_arm64}, + {"test_uc_ctl_change_page_size_arm64", test_uc_ctl_change_page_size_arm64}, #endif - {"test_uc_hook_cached_uaf", test_uc_hook_cached_uaf}, - {"test_uc_emu_stop_set_ip", test_uc_emu_stop_set_ip}, - {"test_tlb_clear", test_tlb_clear}, - {"test_noexec", test_noexec}, - {NULL, NULL}}; + {"test_uc_hook_cached_uaf", test_uc_hook_cached_uaf}, + {"test_uc_emu_stop_set_ip", test_uc_emu_stop_set_ip}, + {"test_tlb_clear", test_tlb_clear}, + {"test_noexec", test_noexec}, + {NULL, NULL}}; diff --git a/tests/unit/test_x86.c b/tests/unit/test_x86.c index 13f03e7c..59d0408a 100644 --- a/tests/unit/test_x86.c +++ b/tests/unit/test_x86.c @@ -61,8 +61,8 @@ static void QuickTest_run(QuickTest *test) uint64_t value = 0; OK(uc_reg_read(uc, out->reg, &value)); acutest_check_(value == out->value, out->file, out->line, - "OUT_REG(%s, 0x%" PRIx64 ") = 0x%"PRIx64"", out->name, - out->value, value); + "OUT_REG(%s, 0x%" PRIx64 ") = 0x%" PRIx64 "", + out->name, out->value, value); } else { uint32_t value = 0; OK(uc_reg_read(uc, out->reg, &value)); @@ -2019,7 +2019,8 @@ static void test_x86_hook_insn_rdtscp(void) OK(uc_close(uc)); } -static void test_x86_dr7() { +static void test_x86_dr7() +{ uc_engine *uc; char code[] = "\x48\xC7\xC0\x05\x00\x01\x00\x0F\x23\xF8"; // mov rax, 0x10005 @@ -2031,14 +2032,14 @@ static void test_x86_dr7() { } static void test_x86_hook_block_cb(uc_engine *uc, uint64_t address, - uint32_t size, void *user_data) + uint32_t size, void *user_data) { uint32_t pc; - OK(uc_reg_read(uc, UC_X86_REG_EIP, (void*)&pc)); + OK(uc_reg_read(uc, UC_X86_REG_EIP, (void *)&pc)); TEST_CHECK(pc == address); - *((uint64_t*)user_data) += 1; + *((uint64_t *)user_data) += 1; } static void test_x86_hook_block() @@ -2051,7 +2052,8 @@ static void test_x86_hook_block() uc_common_setup(&uc, UC_ARCH_X86, UC_MODE_32, code, sizeof(code) - 1); - OK(uc_hook_add(uc, &hk, UC_HOOK_BLOCK, test_x86_hook_block_cb, (void*)&cnt, 1, 0)); + OK(uc_hook_add(uc, &hk, UC_HOOK_BLOCK, test_x86_hook_block_cb, (void *)&cnt, + 1, 0)); OK(uc_emu_start(uc, code_start, code_start + sizeof(code) - 1, 0, 0)); TEST_CHECK(cnt == 2);