mirrors/unicorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove NULL tcg arg and add a test for sysenter

Browse Source
This commit is contained in:
mio 2021-10-04 18:50:18 +02:00
parent 2aebf93143
commit bccc7f2fb7
No known key found for this signature in database
GPG Key ID: DFF27E34A47CB873
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qemu/target/i386/translate.c
View File

@ -7851,8 +7851,10 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
if (!s->pe) {
gen_exception(s, EXCP0D_GPF, pc_start - s->cs_base);
} else {
gen_helper_sysenter(tcg_ctx, tcg_ctx->cpu_env, 0);
TCGv_i32 addend = tcg_const_i32(tcg_ctx, s->pc - pc_start);
gen_helper_sysenter(tcg_ctx, tcg_ctx->cpu_env, addend);
gen_eob(s);
tcg_temp_free_i32(tcg_ctx, addend);
}
break;
case 0x135: /* sysexit */

22
tests/unit/test_x86.c
View File

@ -504,6 +504,27 @@ static void test_x86_mmio_uc_mem_rw() {
OK(uc_close(uc));
}
static void test_x86_sysenter_hook(uc_engine* uc, void* user) {
*(int*)user = 1;
}
static void test_x86_sysenter() {
uc_engine* uc;
char code[] = "\x0F\x34"; // sysenter
uc_hook h;
int called = 0;
uc_common_setup(&uc, UC_ARCH_X86, UC_MODE_32, code, sizeof(code) - 1);
OK(uc_hook_add(uc, &h, UC_HOOK_INSN, test_x86_sysenter_hook, &called, 1, 0, UC_X86_INS_SYSENTER));
OK(uc_emu_start(uc, code_start, code_start + sizeof(code) - 1, 0, 0));
TEST_CHECK(called == 1);
OK(uc_close(uc));
}
TEST_LIST = {
{ "test_x86_in", test_x86_in },
{ "test_x86_out", test_x86_out },
@ -523,5 +544,6 @@ TEST_LIST = {
{ "test_x86_missing_code", test_x86_missing_code},
{ "test_x86_smc_xor", test_x86_smc_xor},
{ "test_x86_mmio_uc_mem_rw", test_x86_mmio_uc_mem_rw},
{ "test_x86_sysenter", test_x86_sysenter},
{ NULL, NULL }
};