Commit ea48ae91 authored by Roman Bolshakov's avatar Roman Bolshakov Committed by Paolo Bonzini
Browse files

i386: hvf: Drop copy of RFLAGS defines 



Use the ones provided in target/i386/cpu.h instead.

Signed-off-by: default avatarRoman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200528193758.51454-10-r.bolshakov@yadro.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 967f4da2

target/i386/hvf/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ bool x86_is_v8086(struct CPUState *cpu) 
{

    X86CPU *x86_cpu = X86_CPU(cpu);

    CPUX86State *env = &x86_cpu->env;

    return x86_is_protected(cpu) && (env->eflags & RFLAGS_VM);

    return x86_is_protected(cpu) && (env->eflags & VM_MASK);

}



bool x86_is_long_mode(struct CPUState *cpu)

target/i386/hvf/x86.h

+0 −20
Original line number Diff line number Diff line
@@ -42,26 +42,6 @@ typedef struct x86_register { 
    };

} __attribute__ ((__packed__)) x86_register;



typedef enum x86_rflags {

    RFLAGS_CF       = (1L << 0),

    RFLAGS_PF       = (1L << 2),

    RFLAGS_AF       = (1L << 4),

    RFLAGS_ZF       = (1L << 6),

    RFLAGS_SF       = (1L << 7),

    RFLAGS_TF       = (1L << 8),

    RFLAGS_IF       = (1L << 9),

    RFLAGS_DF       = (1L << 10),

    RFLAGS_OF       = (1L << 11),

    RFLAGS_IOPL     = (3L << 12),

    RFLAGS_NT       = (1L << 14),

    RFLAGS_RF       = (1L << 16),

    RFLAGS_VM       = (1L << 17),

    RFLAGS_AC       = (1L << 18),

    RFLAGS_VIF      = (1L << 19),

    RFLAGS_VIP      = (1L << 20),

    RFLAGS_ID       = (1L << 21),

} x86_rflags;



typedef enum x86_reg_cr0 {

    CR0_PE =            (1L << 0),

    CR0_MP =            (1L << 1),

target/i386/hvf/x86_decode.c

+7 −9
Original line number Diff line number Diff line
@@ -697,15 +697,13 @@ static void decode_db_4(CPUX86State *env, struct x86_decode *decode) 




#define RFLAGS_MASK_NONE    0

#define RFLAGS_MASK_OSZAPC  (RFLAGS_OF | RFLAGS_SF | RFLAGS_ZF | RFLAGS_AF | \

                             RFLAGS_PF | RFLAGS_CF)

#define RFLAGS_MASK_LAHF    (RFLAGS_SF | RFLAGS_ZF | RFLAGS_AF | RFLAGS_PF | \

                             RFLAGS_CF)

#define RFLAGS_MASK_CF      (RFLAGS_CF)

#define RFLAGS_MASK_IF      (RFLAGS_IF)

#define RFLAGS_MASK_TF      (RFLAGS_TF)

#define RFLAGS_MASK_DF      (RFLAGS_DF)

#define RFLAGS_MASK_ZF      (RFLAGS_ZF)

#define RFLAGS_MASK_OSZAPC  (CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C)

#define RFLAGS_MASK_LAHF    (CC_S | CC_Z | CC_A | CC_P | CC_C)

#define RFLAGS_MASK_CF      (CC_C)

#define RFLAGS_MASK_IF      (IF_MASK)

#define RFLAGS_MASK_TF      (TF_MASK)

#define RFLAGS_MASK_DF      (DF_MASK)

#define RFLAGS_MASK_ZF      (CC_Z)



struct decode_tbl _1op_inst[] = {

    {0x0, X86_DECODE_CMD_ADD, 1, true, decode_modrm_rm, decode_modrm_reg, NULL,

target/i386/hvf/x86_task.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ void vmx_handle_task_switch(CPUState *cpu, x68_segment_selector tss_sel, int rea 
    }



    if (reason == TSR_IRET)

        env->eflags &= ~RFLAGS_NT;

        env->eflags &= ~NT_MASK;



    if (reason != TSR_CALL && reason != TSR_IDT_GATE)

        old_tss_sel.sel = 0xffff;