---

yaml --- r: 373083 b: refs/heads/master c: 660696d h: refs/heads/master i: 373081: 5df34f5 373079: 7684d9b v: v3
git-mirror · Apr 25, 2013 · dc4eed7 · dc4eed7
1 parent f5f134c
commit dc4eed7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1fa0352a151a597e8749e7be84121a1ff0d3502
+refs/heads/master: 660696d1d16a71e15549ce1bf74953be1592bcd3
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
@@ -4172,6 +4172,10 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op,
 		break;
 	case OpMem8:
 		ctxt->memop.bytes = 1;
+		if (ctxt->memop.type == OP_REG) {
+			ctxt->memop.addr.reg = decode_register(ctxt, ctxt->modrm_rm, 1);
+			fetch_register_operand(&ctxt->memop);
+		}
 		goto mem_common;
 	case OpMem16:
 		ctxt->memop.bytes = 2;