From 43773ed369a2e1f6c347e30c74df27a8750d1d2d Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 28 Mar 2014 11:28:38 +0100 Subject: [PATCH] target-i386: rename KSMAP to KNOSMAP This is the mode where SMAP is overridden, put "NO" in its name. Signed-off-by: Paolo Bonzini --- target-i386/cpu.h | 6 +++--- target-i386/helper.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index e9cbdab..f88b675 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1155,15 +1155,15 @@ static inline CPUX86State *cpu_init(const char *cpu_model) /* MMU modes definitions */ #define MMU_MODE0_SUFFIX _kernel #define MMU_MODE1_SUFFIX _user -#define MMU_MODE2_SUFFIX _ksmap /* Kernel with SMAP override */ +#define MMU_MODE2_SUFFIX _knosmap /* SMAP disabled or CPL<3 && AC=1 */ #define MMU_KERNEL_IDX 0 #define MMU_USER_IDX 1 -#define MMU_KSMAP_IDX 2 +#define MMU_KNOSMAP_IDX 2 static inline int cpu_mmu_index (CPUX86State *env) { return (env->hflags & HF_CPL_MASK) == 3 ? MMU_USER_IDX : ((env->hflags & HF_SMAP_MASK) && (env->eflags & AC_MASK)) - ? MMU_KSMAP_IDX : MMU_KERNEL_IDX; + ? MMU_KNOSMAP_IDX : MMU_KERNEL_IDX; } #define CC_DST (env->cc_dst) diff --git a/target-i386/helper.c b/target-i386/helper.c index 46d20e4..88bbe65 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -654,7 +654,7 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr, goto do_fault_protect; } /* fall through */ - case MMU_KSMAP_IDX: + case MMU_KNOSMAP_IDX: if (is_write1 == 2 && (env->cr[4] & CR4_SMEP_MASK) && (ptep & PG_USER_MASK)) { goto do_fault_protect; @@ -716,7 +716,7 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr, goto do_fault_protect; } /* fall through */ - case MMU_KSMAP_IDX: + case MMU_KNOSMAP_IDX: if (is_write1 == 2 && (env->cr[4] & CR4_SMEP_MASK) && (ptep & PG_USER_MASK)) { goto do_fault_protect; @@ -771,7 +771,7 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr, goto do_fault_protect; } /* fall through */ - case MMU_KSMAP_IDX: + case MMU_KNOSMAP_IDX: if (is_write1 == 2 && (env->cr[4] & CR4_SMEP_MASK) && (pde & PG_USER_MASK)) { goto do_fault_protect; @@ -828,7 +828,7 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr, goto do_fault_protect; } /* fall through */ - case MMU_KSMAP_IDX: + case MMU_KNOSMAP_IDX: if (is_write1 == 2 && (env->cr[4] & CR4_SMEP_MASK) && (ptep & PG_USER_MASK)) { goto do_fault_protect; -- 2.7.4