yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: fix #968. also fix potential bug of not clearing high bytes when updateing EIP

Browse Source
This commit is contained in:
Nguyen Anh Quynh
2018-07-26 15:19:23 +08:00
parent 58e1f03f12
commit 4d0157eb4a
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qemu/target-i386/unicorn.c
View File

@ -971,7 +971,7 @@ int x86_reg_write(struct uc_struct *uc, unsigned int *regs, void *const *vals, i
uc_emu_stop(uc); uc_emu_stop(uc);
break; break;
case UC_X86_REG_IP: case UC_X86_REG_IP:
WRITE_WORD(X86_CPU(uc, mycpu)->env.eip, *(uint16_t *)value); X86_CPU(uc, mycpu)->env.eip = *(uint16_t *)value;
// force to quit execution and flush TB // force to quit execution and flush TB
uc->quit_request = true; uc->quit_request = true;
uc_emu_stop(uc); uc_emu_stop(uc);
@ -1161,7 +1161,7 @@ int x86_reg_write(struct uc_struct *uc, unsigned int *regs, void *const *vals, i
uc_emu_stop(uc); uc_emu_stop(uc);
break; break;
case UC_X86_REG_EIP: case UC_X86_REG_EIP:
WRITE_DWORD(X86_CPU(uc, mycpu)->env.eip, *(uint32_t *)value); X86_CPU(uc, mycpu)->env.eip = *(uint32_t *)value;
// force to quit execution and flush TB // force to quit execution and flush TB
uc->quit_request = true; uc->quit_request = true;
uc_emu_stop(uc); uc_emu_stop(uc);

11
uc.c
View File

@ -548,9 +548,16 @@ uc_err uc_emu_start(uc_engine* uc, uint64_t begin, uint64_t until, uint64_t time
switch(uc->mode) { switch(uc->mode) {
default: default:
break; break;
case UC_MODE_16: case UC_MODE_16: {
uc_reg_write(uc, UC_X86_REG_IP, &begin); uint64_t ip;
uint16_t cs;
uc_reg_read(uc, UC_X86_REG_CS, &cs);
// compensate for later adding up IP & CS
ip = begin - cs*16;
uc_reg_write(uc, UC_X86_REG_IP, &ip);
break; break;
}
case UC_MODE_32: case UC_MODE_32:
uc_reg_write(uc, UC_X86_REG_EIP, &begin); uc_reg_write(uc, UC_X86_REG_EIP, &begin);
break; break;