diff options
| -rw-r--r-- | cpu-exec.c | 2 | ||||
| -rw-r--r-- | target-i386/helper.c | 4 | ||||
| -rw-r--r-- | target-i386/helper2.c | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 89bf8b85e1..7c056d40b6 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -904,7 +904,7 @@ static inline int handle_cpu_signal(unsigned long pc, unsigned long address, /* we restore the process signal mask as the sigreturn should do it (XXX: use sigsetjmp) */ sigprocmask(SIG_SETMASK, old_set, NULL); - raise_exception_err(EXCP0E_PAGE, env->error_code); + raise_exception_err(env->exception_index, env->error_code); } else { /* activate soft MMU for this block */ env->hflags |= HF_SOFTMMU_MASK; diff --git a/target-i386/helper.c b/target-i386/helper.c index 6939cb76c1..5c1d6cd80d 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -3478,9 +3478,9 @@ void tlb_fill(target_ulong addr, int is_write, int is_user, void *retaddr) } } if (retaddr) - raise_exception_err(EXCP0E_PAGE, env->error_code); + raise_exception_err(env->exception_index, env->error_code); else - raise_exception_err_norestore(EXCP0E_PAGE, env->error_code); + raise_exception_err_norestore(env->exception_index, env->error_code); } env = saved_env; } diff --git a/target-i386/helper2.c b/target-i386/helper2.c index 678c94168d..cb896cb5ec 100644 --- a/target-i386/helper2.c +++ b/target-i386/helper2.c @@ -566,6 +566,7 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr, env->cr[2] = addr; env->error_code = (is_write << PG_ERROR_W_BIT); env->error_code |= PG_ERROR_U_MASK; + env->exception_index = EXCP0E_PAGE; return 1; } @@ -620,8 +621,9 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr, /* test virtual address sign extension */ sext = (int64_t)addr >> 47; if (sext != 0 && sext != -1) { - error_code = 0; - goto do_fault; + env->error_code = 0; + env->exception_index = EXCP0D_GPF; + return 1; } pml4e_addr = ((env->cr[3] & ~0xfff) + (((addr >> 39) & 0x1ff) << 3)) & @@ -862,6 +864,7 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr, (env->cr[4] & CR4_PAE_MASK)) error_code |= PG_ERROR_I_D_MASK; env->error_code = error_code; + env->exception_index = EXCP0E_PAGE; return 1; } |