Commit ab0a19d4 authored by Yang Zhong's avatar Yang Zhong Committed by Paolo Bonzini
Browse files

target/i386: move cpu_sync_bndcs_hflags() function 



Move cpu_sync_bndcs_hflags() function from mpx_helper.c
to helper.c because mpx_helper.c need be disabled when
tcg is disabled.

Signed-off-by: default avatarYang Zhong <yang.zhong@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e4b4b642

target/i386/helper.c

+30 −0
Original line number Diff line number Diff line
@@ -29,6 +29,36 @@ 
#include "hw/i386/apic_internal.h"

#endif



void cpu_sync_bndcs_hflags(CPUX86State *env)

{

    uint32_t hflags = env->hflags;

    uint32_t hflags2 = env->hflags2;

    uint32_t bndcsr;



    if ((hflags & HF_CPL_MASK) == 3) {

        bndcsr = env->bndcs_regs.cfgu;

    } else {

        bndcsr = env->msr_bndcfgs;

    }



    if ((env->cr[4] & CR4_OSXSAVE_MASK)

        && (env->xcr0 & XSTATE_BNDCSR_MASK)

        && (bndcsr & BNDCFG_ENABLE)) {

        hflags |= HF_MPX_EN_MASK;

    } else {

        hflags &= ~HF_MPX_EN_MASK;

    }



    if (bndcsr & BNDCFG_BNDPRESERVE) {

        hflags2 |= HF2_MPX_PR_MASK;

    } else {

        hflags2 &= ~HF2_MPX_PR_MASK;

    }



    env->hflags = hflags;

    env->hflags2 = hflags2;

}



static void cpu_x86_version(CPUX86State *env, int *family, int *model)

{

    int cpuver = env->cpuid_version;

target/i386/mpx_helper.c

+0 −30
Original line number Diff line number Diff line
@@ -24,36 +24,6 @@ 
#include "exec/exec-all.h"





void cpu_sync_bndcs_hflags(CPUX86State *env)

{

    uint32_t hflags = env->hflags;

    uint32_t hflags2 = env->hflags2;

    uint32_t bndcsr;



    if ((hflags & HF_CPL_MASK) == 3) {

        bndcsr = env->bndcs_regs.cfgu;

    } else {

        bndcsr = env->msr_bndcfgs;

    }



    if ((env->cr[4] & CR4_OSXSAVE_MASK)

        && (env->xcr0 & XSTATE_BNDCSR_MASK)

        && (bndcsr & BNDCFG_ENABLE)) {

        hflags |= HF_MPX_EN_MASK;

    } else {

        hflags &= ~HF_MPX_EN_MASK;

    }



    if (bndcsr & BNDCFG_BNDPRESERVE) {

        hflags2 |= HF2_MPX_PR_MASK;

    } else {

        hflags2 &= ~HF2_MPX_PR_MASK;

    }



    env->hflags = hflags;

    env->hflags2 = hflags2;

}



void helper_bndck(CPUX86State *env, uint32_t fail)

{

    if (unlikely(fail)) {