KVM: x86 emulator: move all x86_emulate_memop() to a structure (e4e03ded) · Commits · 戴 / test

Move all x86_emulate_memop() common variables between decode and execute to a structure decode_cache. This will help in later separating decode and emulate. struct decode_cache { u8 twobyte; u8 b; u8 lock_prefix; u8 rep_prefix; u8 op_bytes; u8 ad_bytes; struct operand src; struct operand dst; unsigned long *override_base; unsigned int d; unsigned long regs[NR_VCPU_REGS]; unsigned long eip; /* modrm */ u8 modrm; u8 modrm_mod; u8 modrm_reg; u8 modrm_rm; u8 use_modrm_ea; unsigned long modrm_ea; unsigned long modrm_val; }; Signed-off-by:

Laurent Vivier <Laurent.Vivier@bull.net> Signed-off-by:

Avi Kivity <avi@qumranet.com>

drivers/kvm/x86_emulate.c

+484 −435

File changed.

Preview size limit exceeded, changes collapsed.

drivers/kvm/x86_emulate.h

+34 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,36 @@ struct x86_emulate_ops {

		};

		/* Type, address-of, and value of an instruction's operand. */
		struct operand {
		enum { OP_REG, OP_MEM, OP_IMM } type;
		unsigned int bytes;
		unsigned long val, orig_val, *ptr;
		};

		struct decode_cache {
		u8 twobyte;
		u8 b;
		u8 lock_prefix;
		u8 rep_prefix;
		u8 op_bytes;
		u8 ad_bytes;
		struct operand src;
		struct operand dst;
		unsigned long *override_base;
		unsigned int d;
		unsigned long regs[NR_VCPU_REGS];
		unsigned long eip;
		/* modrm */
		u8 modrm;
		u8 modrm_mod;
		u8 modrm_reg;
		u8 modrm_rm;
		u8 use_modrm_ea;
		unsigned long modrm_ea;
		unsigned long modrm_val;
		};

		struct x86_emulate_ctxt {
		/* Register state before/after emulation. */
		struct kvm_vcpu *vcpu;
		@@ -129,6 +159,10 @@ struct x86_emulate_ctxt {
		unsigned long ss_base;
		unsigned long gs_base;
		unsigned long fs_base;

		/* decode cache */

		struct decode_cache decode;
		};

		/* Execution mode, passed to the emulator. */

Admin message