Commit 35b1b927 authored by Tao Wu's avatar Tao Wu Committed by Paolo Bonzini
Browse files

target/i386: move hflags update code to a function 



We will share the same code for hax/kvm.

Signed-off-by: default avatarTao Wu <lepton@google.com>
Message-Id: <20180110195056.85403-1-lepton@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 52cb6817

target/i386/cpu.c

+42 −0
Original line number Diff line number Diff line
@@ -4147,6 +4147,48 @@ static void x86_disas_set_info(CPUState *cs, disassemble_info *info) 
    info->cap_insn_split = 8;

}



void x86_update_hflags(CPUX86State *env)

{

   uint32_t hflags;

#define HFLAG_COPY_MASK \

    ~( HF_CPL_MASK | HF_PE_MASK | HF_MP_MASK | HF_EM_MASK | \

       HF_TS_MASK | HF_TF_MASK | HF_VM_MASK | HF_IOPL_MASK | \

       HF_OSFXSR_MASK | HF_LMA_MASK | HF_CS32_MASK | \

       HF_SS32_MASK | HF_CS64_MASK | HF_ADDSEG_MASK)



    hflags = env->hflags & HFLAG_COPY_MASK;

    hflags |= (env->segs[R_SS].flags >> DESC_DPL_SHIFT) & HF_CPL_MASK;

    hflags |= (env->cr[0] & CR0_PE_MASK) << (HF_PE_SHIFT - CR0_PE_SHIFT);

    hflags |= (env->cr[0] << (HF_MP_SHIFT - CR0_MP_SHIFT)) &

                (HF_MP_MASK | HF_EM_MASK | HF_TS_MASK);

    hflags |= (env->eflags & (HF_TF_MASK | HF_VM_MASK | HF_IOPL_MASK));



    if (env->cr[4] & CR4_OSFXSR_MASK) {

        hflags |= HF_OSFXSR_MASK;

    }



    if (env->efer & MSR_EFER_LMA) {

        hflags |= HF_LMA_MASK;

    }



    if ((hflags & HF_LMA_MASK) && (env->segs[R_CS].flags & DESC_L_MASK)) {

        hflags |= HF_CS32_MASK | HF_SS32_MASK | HF_CS64_MASK;

    } else {

        hflags |= (env->segs[R_CS].flags & DESC_B_MASK) >>

                    (DESC_B_SHIFT - HF_CS32_SHIFT);

        hflags |= (env->segs[R_SS].flags & DESC_B_MASK) >>

                    (DESC_B_SHIFT - HF_SS32_SHIFT);

        if (!(env->cr[0] & CR0_PE_MASK) || (env->eflags & VM_MASK) ||

            !(hflags & HF_CS32_MASK)) {

            hflags |= HF_ADDSEG_MASK;

        } else {

            hflags |= ((env->segs[R_DS].base | env->segs[R_ES].base |

                        env->segs[R_SS].base) != 0) << HF_ADDSEG_SHIFT;

        }

    }

    env->hflags = hflags;

}



static Property x86_cpu_properties[] = {

#ifdef CONFIG_USER_ONLY

    /* apic_id = 0 by default for *-user, see commit 9886e834 */

target/i386/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -1778,4 +1778,6 @@ bool cpu_is_bsp(X86CPU *cpu); 


void x86_cpu_xrstor_all_areas(X86CPU *cpu, const X86XSaveArea *buf);

void x86_cpu_xsave_all_areas(X86CPU *cpu, X86XSaveArea *buf);

void x86_update_hflags(CPUX86State* env);



#endif /* I386_CPU_H */

target/i386/kvm.c

+1 −39
Original line number Diff line number Diff line
@@ -1891,7 +1891,6 @@ static int kvm_get_sregs(X86CPU *cpu) 
{

    CPUX86State *env = &cpu->env;

    struct kvm_sregs sregs;

    uint32_t hflags;

    int bit, i, ret;



    ret = kvm_vcpu_ioctl(CPU(cpu), KVM_GET_SREGS, &sregs);
@@ -1933,44 +1932,7 @@ static int kvm_get_sregs(X86CPU *cpu) 
    env->efer = sregs.efer;



    /* changes to apic base and cr8/tpr are read back via kvm_arch_post_run */



#define HFLAG_COPY_MASK \

    ~( HF_CPL_MASK | HF_PE_MASK | HF_MP_MASK | HF_EM_MASK | \

       HF_TS_MASK | HF_TF_MASK | HF_VM_MASK | HF_IOPL_MASK | \

       HF_OSFXSR_MASK | HF_LMA_MASK | HF_CS32_MASK | \

       HF_SS32_MASK | HF_CS64_MASK | HF_ADDSEG_MASK)



    hflags = env->hflags & HFLAG_COPY_MASK;

    hflags |= (env->segs[R_SS].flags >> DESC_DPL_SHIFT) & HF_CPL_MASK;

    hflags |= (env->cr[0] & CR0_PE_MASK) << (HF_PE_SHIFT - CR0_PE_SHIFT);

    hflags |= (env->cr[0] << (HF_MP_SHIFT - CR0_MP_SHIFT)) &

                (HF_MP_MASK | HF_EM_MASK | HF_TS_MASK);

    hflags |= (env->eflags & (HF_TF_MASK | HF_VM_MASK | HF_IOPL_MASK));



    if (env->cr[4] & CR4_OSFXSR_MASK) {

        hflags |= HF_OSFXSR_MASK;

    }



    if (env->efer & MSR_EFER_LMA) {

        hflags |= HF_LMA_MASK;

    }



    if ((hflags & HF_LMA_MASK) && (env->segs[R_CS].flags & DESC_L_MASK)) {

        hflags |= HF_CS32_MASK | HF_SS32_MASK | HF_CS64_MASK;

    } else {

        hflags |= (env->segs[R_CS].flags & DESC_B_MASK) >>

                    (DESC_B_SHIFT - HF_CS32_SHIFT);

        hflags |= (env->segs[R_SS].flags & DESC_B_MASK) >>

                    (DESC_B_SHIFT - HF_SS32_SHIFT);

        if (!(env->cr[0] & CR0_PE_MASK) || (env->eflags & VM_MASK) ||

            !(hflags & HF_CS32_MASK)) {

            hflags |= HF_ADDSEG_MASK;

        } else {

            hflags |= ((env->segs[R_DS].base | env->segs[R_ES].base |

                        env->segs[R_SS].base) != 0) << HF_ADDSEG_SHIFT;

        }

    }

    env->hflags = hflags;

    x86_update_hflags(env);



    return 0;

}