x86: correct EIP of INT instruction by updating it only after calling interrupt handler

2015-09-06 14:58:11 +08:00
parent cf00345d65
commit a166c24f8e
2 changed files with 5 additions and 1 deletions
--- a/qemu/cpu-exec.c
+++ b/qemu/cpu-exec.c
@ -144,6 +144,10 @@ int cpu_exec(struct uc_struct *uc, CPUArchState *env)   // qq
                            uc, cpu->exception_index,
                            uc->hook_callbacks[uc->hook_intr_idx].user_data);
                    cpu->exception_index = -1;
+#if defined(TARGET_X86_64)
+                    // point EIP to the next instruction after INT
+                    env->eip = env->exception_next_eip;
+#endif
 #endif
                }
            }