>From 3ceb677ffee889880020d8ccb6b9f2c5bfb05644 Mon Sep 17 00:00:00 2001 From: Sheng Yang <[EMAIL PROTECTED]> Date: Fri, 26 Oct 2007 17:15:36 +0800 Subject: [PATCH 1/2] KVM: x86_emulator: Decode the memory operand for 'mov'
For the following TPR patch, we must get gva for executing instructions.
Most
memory operands are decoded in ModR/M part, except some kinds of 'mov'.
This
patch decoded the memory operand for these 'mov' instructions, instead
of using
CR2.
Signed-off-by: Sheng Yang <[EMAIL PROTECTED]>
---
drivers/kvm/x86_emulate.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c
index f858c01..5f6a40c 100644
--- a/drivers/kvm/x86_emulate.c
+++ b/drivers/kvm/x86_emulate.c
@@ -837,6 +837,9 @@ modrm_done:
&& c->modrm_reg == 7)
break;
srcmem_common:
+ /* Decode memory operand for mov(0xa0 ... 0xa1)*/
+ if ((c->b == 0xa0) || (c->b == 0xa1))
+ ctxt->cr2 = insn_fetch(u32, c->src.bytes,
c->eip);
/*
* For instructions with a ModR/M byte, switch to
register
* access if Mod = 3.
@@ -906,6 +909,7 @@ modrm_done:
}
break;
case DstMem:
+ c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
/*
* For instructions with a ModR/M byte, switch to
register
* access if Mod = 3.
@@ -914,6 +918,9 @@ modrm_done:
c->dst.type = OP_REG;
else
c->dst.type = OP_MEM;
+ /* Decode memory operand for mov(0xa2 ... 0xa3)*/
+ if ((c->b == 0xa2) || (c->b == 0xa3))
+ ctxt->cr2 = insn_fetch(u32, c->dst.bytes,
c->eip);
break;
}
@@ -1337,13 +1344,9 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt,
struct x86_emulate_ops *ops)
case 0xa0 ... 0xa1: /* mov */
c->dst.ptr = (unsigned long *)&c->regs[VCPU_REGS_RAX];
c->dst.val = c->src.val;
- /* skip src displacement */
- c->eip += c->ad_bytes;
break;
case 0xa2 ... 0xa3: /* mov */
c->dst.val = (unsigned long)c->regs[VCPU_REGS_RAX];
- /* skip c->dst displacement */
- c->eip += c->ad_bytes;
break;
case 0xc0 ... 0xc1:
emulate_grp2(ctxt);
--
1.5.2
0001-KVM-x86_emulator-Decode-the-memory-operand-for-mo.patch
Description: 0001-KVM-x86_emulator-Decode-the-memory-operand-for-mo.patch
------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
