From 54ca9095f046dfa03c3d093cc55f6d76b61864e1 Mon Sep 17 00:00:00 2001 From: bellard Date: Sun, 4 Dec 2005 18:46:06 +0000 Subject: generate GPF if non canonical addresses git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1681 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-i386/helper2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'target-i386/helper2.c') 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; } -- cgit v1.2.3