Format code
This commit is contained in:
@@ -395,7 +395,9 @@ static void test_noexec(void)
|
||||
OK(uc_ctl_tlb_mode(uc, UC_TLB_VIRTUAL));
|
||||
OK(uc_mem_protect(uc, code_start, code_start + 0x1000, UC_PROT_EXEC));
|
||||
|
||||
uc_assert_err(UC_ERR_READ_PROT, uc_emu_start(uc, code_start, code_start + sizeof(code) - 1, 0, 0));
|
||||
uc_assert_err(
|
||||
UC_ERR_READ_PROT,
|
||||
uc_emu_start(uc, code_start, code_start + sizeof(code) - 1, 0, 0));
|
||||
|
||||
OK(uc_close(uc));
|
||||
}
|
||||
|
||||
@@ -302,13 +302,13 @@ static void test_snapshot(void)
|
||||
OK(uc_mem_read(uc, 0x2020, &mem, sizeof(mem)));
|
||||
TEST_CHECK(mem == 2);
|
||||
OK(uc_context_restore(uc, c1));
|
||||
//TODO check mem
|
||||
// TODO check mem
|
||||
OK(uc_mem_read(uc, 0x2020, &mem, sizeof(mem)));
|
||||
TEST_CHECK(mem == 1);
|
||||
OK(uc_context_restore(uc, c0));
|
||||
OK(uc_mem_read(uc, 0x2020, &mem, sizeof(mem)));
|
||||
TEST_CHECK(mem == 0);
|
||||
//TODO check mem
|
||||
// TODO check mem
|
||||
|
||||
OK(uc_context_free(c0));
|
||||
OK(uc_context_free(c1));
|
||||
@@ -322,7 +322,7 @@ static void test_context_snapshot(void)
|
||||
uint64_t tmp = 1;
|
||||
|
||||
OK(uc_open(UC_ARCH_X86, UC_MODE_64, &uc));
|
||||
OK(uc_ctl_context_mode(uc, UC_CTL_CONTEXT_MEMORY|UC_CTL_CONTEXT_CPU));
|
||||
OK(uc_ctl_context_mode(uc, UC_CTL_CONTEXT_MEMORY | UC_CTL_CONTEXT_CPU));
|
||||
OK(uc_mem_map(uc, 0x1000, 0x1000, UC_PROT_ALL));
|
||||
OK(uc_context_alloc(uc, &ctx));
|
||||
OK(uc_context_save(uc, ctx));
|
||||
@@ -353,7 +353,7 @@ static void test_snapshot_unmap(void)
|
||||
uint64_t tmp;
|
||||
|
||||
OK(uc_open(UC_ARCH_X86, UC_MODE_64, &uc));
|
||||
OK(uc_ctl_context_mode(uc, UC_CTL_CONTEXT_MEMORY|UC_CTL_CONTEXT_CPU));
|
||||
OK(uc_ctl_context_mode(uc, UC_CTL_CONTEXT_MEMORY | UC_CTL_CONTEXT_CPU));
|
||||
OK(uc_mem_map(uc, 0x1000, 0x2000, UC_PROT_ALL));
|
||||
|
||||
tmp = 1;
|
||||
@@ -366,8 +366,10 @@ static void test_snapshot_unmap(void)
|
||||
|
||||
uc_assert_err(UC_ERR_ARG, uc_mem_unmap(uc, 0x1000, 0x1000));
|
||||
OK(uc_mem_unmap(uc, 0x1000, 0x2000));
|
||||
uc_assert_err(UC_ERR_READ_UNMAPPED, uc_mem_read(uc, 0x1000, &tmp, sizeof(tmp)));
|
||||
uc_assert_err(UC_ERR_READ_UNMAPPED, uc_mem_read(uc, 0x2000, &tmp, sizeof(tmp)));
|
||||
uc_assert_err(UC_ERR_READ_UNMAPPED,
|
||||
uc_mem_read(uc, 0x1000, &tmp, sizeof(tmp)));
|
||||
uc_assert_err(UC_ERR_READ_UNMAPPED,
|
||||
uc_mem_read(uc, 0x2000, &tmp, sizeof(tmp)));
|
||||
|
||||
OK(uc_context_restore(uc, ctx));
|
||||
OK(uc_mem_read(uc, 0x1000, &tmp, sizeof(tmp)));
|
||||
|
||||
@@ -1438,7 +1438,8 @@ static void test_x86_segmentation()
|
||||
uc_assert_err(UC_ERR_EXCEPTION, uc_reg_write(uc, UC_X86_REG_FS, &fs));
|
||||
}
|
||||
|
||||
static void test_x86_0xff_lcall_callback(uc_engine *uc, uint64_t address, uint32_t size, void *user_data)
|
||||
static void test_x86_0xff_lcall_callback(uc_engine *uc, uint64_t address,
|
||||
uint32_t size, void *user_data)
|
||||
{
|
||||
// do nothing
|
||||
return;
|
||||
@@ -1447,9 +1448,11 @@ static void test_x86_0xff_lcall_callback(uc_engine *uc, uint64_t address, uint32
|
||||
// This aborts prior to a7a5d187e77f7853755eff4768658daf8095c3b7
|
||||
static void test_x86_0xff_lcall()
|
||||
{
|
||||
uc_engine* uc;
|
||||
uc_engine *uc;
|
||||
uc_hook hk;
|
||||
const char code[] = "\xB8\x01\x00\x00\x00\xBB\x01\x00\x00\x00\xB9\x01\x00\x00\x00\xFF\xDD\xBA\x01\x00\x00\x00\xB8\x02\x00\x00\x00\xBB\x02\x00\x00\x00";
|
||||
const char code[] =
|
||||
"\xB8\x01\x00\x00\x00\xBB\x01\x00\x00\x00\xB9\x01\x00\x00\x00\xFF\xDD"
|
||||
"\xBA\x01\x00\x00\x00\xB8\x02\x00\x00\x00\xBB\x02\x00\x00\x00";
|
||||
// Taken from #1842
|
||||
// 0: b8 01 00 00 00 mov eax,0x1
|
||||
// 5: bb 01 00 00 00 mov ebx,0x1
|
||||
@@ -1458,21 +1461,22 @@ static void test_x86_0xff_lcall()
|
||||
// 10: dd ba 01 00 00 00 fnstsw WORD PTR [edx+0x1]
|
||||
// 16: b8 02 00 00 00 mov eax,0x2
|
||||
// 1b: bb 02 00 00 00 mov ebx,0x2
|
||||
|
||||
|
||||
uc_common_setup(&uc, UC_ARCH_X86, UC_MODE_32, code, sizeof(code) - 1);
|
||||
|
||||
OK(uc_hook_add(uc, &hk, UC_HOOK_CODE, test_x86_0xff_lcall_callback, NULL, 1, 0));
|
||||
OK(uc_hook_add(uc, &hk, UC_HOOK_CODE, test_x86_0xff_lcall_callback, NULL, 1,
|
||||
0));
|
||||
|
||||
uc_assert_err(UC_ERR_INSN_INVALID, uc_emu_start(uc, code_start, code_start + sizeof(code) - 1, 0, 0));
|
||||
uc_assert_err(
|
||||
UC_ERR_INSN_INVALID,
|
||||
uc_emu_start(uc, code_start, code_start + sizeof(code) - 1, 0, 0));
|
||||
|
||||
OK(uc_close(uc));
|
||||
}
|
||||
|
||||
|
||||
static bool
|
||||
test_x86_64_not_overwriting_tmp0_for_pc_update_cb(uc_engine *uc, uc_mem_type type,
|
||||
uint64_t address, int size,
|
||||
uint64_t value, void *user_data)
|
||||
static bool test_x86_64_not_overwriting_tmp0_for_pc_update_cb(
|
||||
uc_engine *uc, uc_mem_type type, uint64_t address, int size, uint64_t value,
|
||||
void *user_data)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -1481,20 +1485,24 @@ test_x86_64_not_overwriting_tmp0_for_pc_update_cb(uc_engine *uc, uc_mem_type typ
|
||||
// https://github.com/unicorn-engine/unicorn/issues/1862
|
||||
static void test_x86_64_not_overwriting_tmp0_for_pc_update()
|
||||
{
|
||||
uc_engine* uc;
|
||||
uc_engine *uc;
|
||||
uc_hook hk;
|
||||
const char code[] = "\x48\xb9\xff\xff\xff\xff\xff\xff\xff\xff\x48\x89\x0c\x24\x48\xd3\x24\x24\x73\x0a";
|
||||
const char code[] = "\x48\xb9\xff\xff\xff\xff\xff\xff\xff\xff\x48\x89\x0c"
|
||||
"\x24\x48\xd3\x24\x24\x73\x0a";
|
||||
uint64_t rsp, pc, eflags;
|
||||
|
||||
// 0x1000: movabs rcx, 0xffffffffffffffff
|
||||
// 0x100a: mov qword ptr [rsp], rcx
|
||||
// 0x100e: shl qword ptr [rsp], cl ; (Shift to CF=1)
|
||||
// 0x1012: jae 0xd ; this jump should not be taken! (CF=1 but jae expects CF=0)
|
||||
// 0x1012: jae 0xd ; this jump should not be taken! (CF=1 but jae
|
||||
// expects CF=0)
|
||||
uc_common_setup(&uc, UC_ARCH_X86, UC_MODE_64, code, sizeof(code) - 1);
|
||||
OK(uc_hook_add(uc, &hk, UC_HOOK_MEM_READ | UC_HOOK_MEM_WRITE, test_x86_64_not_overwriting_tmp0_for_pc_update_cb, NULL, 1, 0));
|
||||
OK(uc_hook_add(uc, &hk, UC_HOOK_MEM_READ | UC_HOOK_MEM_WRITE,
|
||||
test_x86_64_not_overwriting_tmp0_for_pc_update_cb, NULL, 1,
|
||||
0));
|
||||
|
||||
rsp = 0x2000;
|
||||
OK(uc_reg_write(uc, UC_X86_REG_RSP, (void*)&rsp));
|
||||
OK(uc_reg_write(uc, UC_X86_REG_RSP, (void *)&rsp));
|
||||
OK(uc_emu_start(uc, code_start, code_start + sizeof(code) - 1, 0, 4));
|
||||
OK(uc_reg_read(uc, UC_X86_REG_RIP, &pc));
|
||||
OK(uc_reg_read(uc, UC_X86_REG_EFLAGS, &eflags));
|
||||
@@ -1552,5 +1560,6 @@ TEST_LIST = {
|
||||
{"test_x86_vtlb", test_x86_vtlb},
|
||||
{"test_x86_segmentation", test_x86_segmentation},
|
||||
{"test_x86_0xff_lcall", test_x86_0xff_lcall},
|
||||
{"test_x86_64_not_overwriting_tmp0_for_pc_update", test_x86_64_not_overwriting_tmp0_for_pc_update},
|
||||
{"test_x86_64_not_overwriting_tmp0_for_pc_update",
|
||||
test_x86_64_not_overwriting_tmp0_for_pc_update},
|
||||
{NULL, NULL}};
|
||||
|
||||
Reference in New Issue
Block a user