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

Only set eip to the instruction pointer after an interrupt if the interrupt was user-generated (#875)

Browse Source
This commit is contained in:
Andrew Dutcher
2017-08-29 03:14:36 -07:00
committed by Nguyen Anh Quynh
parent a893bcf138
commit 363cbacee4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qemu/cpu-exec.c
View File

@ -143,8 +143,10 @@ int cpu_exec(struct uc_struct *uc, CPUArchState *env) // qq
} }
cpu->exception_index = -1; cpu->exception_index = -1;
#if defined(TARGET_X86_64) #if defined(TARGET_X86_64)
// point EIP to the next instruction after INT if (env->exception_is_int) {
env->eip = env->exception_next_eip; // point EIP to the next instruction after INT
env->eip = env->exception_next_eip;
}
#endif #endif
#if defined(TARGET_MIPS) || defined(TARGET_MIPS64) #if defined(TARGET_MIPS) || defined(TARGET_MIPS64)
env->active_tc.PC = uc->next_pc; env->active_tc.PC = uc->next_pc;