diff options
| -rw-r--r-- | target-i386/helper.c | 2 | ||||
| -rw-r--r-- | user-exec.c | 16 |
2 files changed, 3 insertions, 15 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index 889fdab45a..1c250b8245 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -701,6 +701,8 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr, env->error_code = (is_write << PG_ERROR_W_BIT); env->error_code |= PG_ERROR_U_MASK; cs->exception_index = EXCP0E_PAGE; + env->exception_is_int = 0; + env->exception_next_eip = -1; return 1; } diff --git a/user-exec.c b/user-exec.c index b9e7bec248..50e95a68de 100644 --- a/user-exec.c +++ b/user-exec.c @@ -40,18 +40,6 @@ //#define DEBUG_SIGNAL -static void exception_action(CPUState *cpu) -{ -#if defined(TARGET_I386) - X86CPU *x86_cpu = X86_CPU(cpu); - CPUX86State *env1 = &x86_cpu->env; - - raise_exception_err(env1, cpu->exception_index, env1->error_code); -#else - cpu_loop_exit(cpu); -#endif -} - /* exit the current TB from a signal handler. The host registers are restored in a state compatible with the CPU emulator */ @@ -120,10 +108,8 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address, /* now we have a real cpu fault */ cpu_restore_state(cpu, pc); - /* we restore the process signal mask as the sigreturn should - do it (XXX: use sigsetjmp) */ sigprocmask(SIG_SETMASK, old_set, NULL); - exception_action(cpu); + cpu_loop_exit(cpu); /* never comes here */ return 1; |