Commit 48520187 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

KVM: x86: save one bit in ctxt->d 



Alignments are exclusive, so 5 modes can be expressed in 3 bits.

Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d3fe959f

arch/x86/kvm/emulate.c

+13 −10
Original line number Diff line number Diff line
@@ -158,9 +158,11 @@ 
#define Src2GS      (OpGS << Src2Shift)

#define Src2Mask    (OpMask << Src2Shift)

#define Mmx         ((u64)1 << 40)  /* MMX Vector instruction */

#define AlignMask   ((u64)7 << 41)

#define Aligned     ((u64)1 << 41)  /* Explicitly aligned (e.g. MOVDQA) */

#define Unaligned   ((u64)1 << 42)  /* Explicitly unaligned (e.g. MOVDQU) */

#define Avx         ((u64)1 << 43)  /* Advanced Vector Extensions */

#define Unaligned   ((u64)2 << 41)  /* Explicitly unaligned (e.g. MOVDQU) */

#define Avx         ((u64)3 << 41)  /* Advanced Vector Extensions */

#define Aligned16   ((u64)4 << 41)  /* Aligned to 16 byte boundary (e.g. FXSAVE) */

#define Fastop      ((u64)1 << 44)  /* Use opcode::u.fastop */

#define NoWrite     ((u64)1 << 45)  /* No writeback */

#define SrcWrite    ((u64)1 << 46)  /* Write back src operand */
@@ -171,7 +173,6 @@ 
#define NearBranch  ((u64)1 << 52)  /* Near branches */

#define No16	    ((u64)1 << 53)  /* No 16 bit operand */

#define IncSP       ((u64)1 << 54)  /* SP is incremented before ModRM calc */

#define Aligned16   ((u64)1 << 55)  /* Aligned to 16 byte boundary (e.g. FXSAVE) */



#define DstXacc     (DstAccLo | SrcAccHi | SrcWrite)
@@ -638,20 +639,22 @@ static void set_segment_selector(struct x86_emulate_ctxt *ctxt, u16 selector, 
 */

static unsigned insn_alignment(struct x86_emulate_ctxt *ctxt, unsigned size)

{

	u64 alignment = ctxt->d & AlignMask;



	if (likely(size < 16))

		return 1;



	if (ctxt->d & Aligned)

		return size;

	else if (ctxt->d & Unaligned)

		return 1;

	else if (ctxt->d & Avx)

	switch (alignment) {

	case Unaligned:

	case Avx:

		return 1;

	else if (ctxt->d & Aligned16)

	case Aligned16:

		return 16;

	else

	case Aligned:

	default:

		return size;

	}

}



static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt,

				       struct segmented_address addr,