From a5d77f63571d95090c5621a199759d5717a0f263 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Sat, 15 Sep 2007 10:35:36 +0300 Subject: [PATCH] --- yaml --- r: 68437 b: refs/heads/master c: 7e0b54b149315743f5743dbc0cf758012682024e h: refs/heads/master i: 68435: ced393d272b56557a352cdce0ec2a334d5e0a5ca v: v3 --- [refs] | 2 +- trunk/drivers/kvm/x86_emulate.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 15a14e9af34d..f5a11235d7e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55bebde45ec252295b08cb3990f15df2228dbf0e +refs/heads/master: 7e0b54b149315743f5743dbc0cf758012682024e diff --git a/trunk/drivers/kvm/x86_emulate.c b/trunk/drivers/kvm/x86_emulate.c index 57f1a5ad0110..4c78a4ff868f 100644 --- a/trunk/drivers/kvm/x86_emulate.c +++ b/trunk/drivers/kvm/x86_emulate.c @@ -125,7 +125,7 @@ static u8 opcode_table[256] = { /* 0x88 - 0x8F */ ByteOp | DstMem | SrcReg | ModRM | Mov, DstMem | SrcReg | ModRM | Mov, ByteOp | DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem | ModRM | Mov, - 0, 0, 0, DstMem | SrcNone | ModRM | Mov, + 0, ModRM | DstReg, 0, DstMem | SrcNone | ModRM | Mov, /* 0x90 - 0x9F */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ImplicitOps, 0, 0, 0, /* 0xA0 - 0xA7 */ @@ -1022,6 +1022,9 @@ x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) break; case 0x88 ... 0x8b: /* mov */ goto mov; + case 0x8d: /* lea r16/r32, m */ + dst.val = modrm_val; + break; case 0x8f: /* pop (sole member of Grp1a) */ /* 64-bit mode: POP always pops a 64-bit operand. */ if (mode == X86EMUL_MODE_PROT64)