ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/i386: Assert CODE32 for x86_64 user-only 

For user-only, CODE32 == !VM86, because we are never in real-mode.
Since we cannot enter vm86 mode for x86_64 user-only, CODE32 is
always set.

Since we're adding an accessor macro, pull the value directly out
of flags otherwise.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210514151342.384376-11-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-05-14 10:13:02 -05:00
parent f8a35846d5
commit 9996dcfd67
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/i386/tcg/translate.c
View File

@ -100,7 +100,6 @@ typedef struct DisasContext {
uint8_t iopl; /* i/o priv level */ uint8_t iopl; /* i/o priv level */
#endif #endif
int code32; /* 32 bit code segment */
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
int lma; /* long mode active */ int lma; /* long mode active */
int code64; /* 64 bit code segment */ int code64; /* 64 bit code segment */
@ -160,8 +159,10 @@ typedef struct DisasContext {
#endif #endif
#if defined(CONFIG_USER_ONLY) && defined(TARGET_X86_64) #if defined(CONFIG_USER_ONLY) && defined(TARGET_X86_64)
#define VM86(S) false #define VM86(S) false
#define CODE32(S) true
#else #else
#define VM86(S) (((S)->flags & HF_VM_MASK) != 0) #define VM86(S) (((S)->flags & HF_VM_MASK) != 0)
#define CODE32(S) (((S)->flags & HF_CS32_MASK) != 0)
#endif #endif
static void gen_eob(DisasContext *s); static void gen_eob(DisasContext *s);
@ -2370,7 +2371,7 @@ static void gen_movl_seg_T0(DisasContext *s, X86Seg seg_reg)
because ss32 may change. For R_SS, translation must always because ss32 may change. For R_SS, translation must always
stop as a special handling must be done to disable hardware stop as a special handling must be done to disable hardware
interrupts for the next instruction */ interrupts for the next instruction */
if (seg_reg == R_SS || (s->code32 && seg_reg < R_FS)) { if (seg_reg == R_SS || (CODE32(s) && seg_reg < R_FS)) {
s->base.is_jmp = DISAS_TOO_MANY; s->base.is_jmp = DISAS_TOO_MANY;
} }
} else { } else {
@ -4619,7 +4620,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
case 0xc4: /* 3-byte VEX */ case 0xc4: /* 3-byte VEX */
/* VEX prefixes cannot be used except in 32-bit mode. /* VEX prefixes cannot be used except in 32-bit mode.
Otherwise the instruction is LES or LDS. */ Otherwise the instruction is LES or LDS. */
if (s->code32 && !VM86(s)) { if (CODE32(s) && !VM86(s)) {
static const int pp_prefix[4] = { static const int pp_prefix[4] = {
0, PREFIX_DATA, PREFIX_REPZ, PREFIX_REPNZ 0, PREFIX_DATA, PREFIX_REPZ, PREFIX_REPNZ
}; };
@ -4686,13 +4687,13 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
aflag = (prefixes & PREFIX_ADR ? MO_32 : MO_64); aflag = (prefixes & PREFIX_ADR ? MO_32 : MO_64);
} else { } else {
/* In 16/32-bit mode, 0x66 selects the opposite data size. */ /* In 16/32-bit mode, 0x66 selects the opposite data size. */
if (s->code32 ^ ((prefixes & PREFIX_DATA) != 0)) { if (CODE32(s) ^ ((prefixes & PREFIX_DATA) != 0)) {
dflag = MO_32; dflag = MO_32;
} else { } else {
dflag = MO_16; dflag = MO_16;
} }
/* In 16/32-bit mode, 0x67 selects the opposite addressing. */ /* In 16/32-bit mode, 0x67 selects the opposite addressing. */
if (s->code32 ^ ((prefixes & PREFIX_ADR) != 0)) { if (CODE32(s) ^ ((prefixes & PREFIX_ADR) != 0)) {
aflag = MO_32; aflag = MO_32;
} else { } else {
aflag = MO_16; aflag = MO_16;
@ -8494,8 +8495,8 @@ static void i386_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cpu)
g_assert(CPL(dc) == cpl); g_assert(CPL(dc) == cpl);
g_assert(IOPL(dc) == iopl); g_assert(IOPL(dc) == iopl);
g_assert(VM86(dc) == ((flags & HF_VM_MASK) != 0)); g_assert(VM86(dc) == ((flags & HF_VM_MASK) != 0));
g_assert(CODE32(dc) == ((flags & HF_CS32_MASK) != 0));
dc->code32 = (flags >> HF_CS32_SHIFT) & 1;
dc->ss32 = (flags >> HF_SS32_SHIFT) & 1; dc->ss32 = (flags >> HF_SS32_SHIFT) & 1;
dc->addseg = (flags >> HF_ADDSEG_SHIFT) & 1; dc->addseg = (flags >> HF_ADDSEG_SHIFT) & 1;
dc->f_st = 0; dc->f_st = 0;