From: Avi Kivity <avi@qumranet.com>
Date: Mon, 16 Jun 2008 04:13:41 +0000 (-0700)
Subject: KVM: x86 emulator: handle undecoded rex.b with r/m = 5 in certain cases
X-Git-Tag: v2.6.27-rc1~968^2~27
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8684c0af0b2bab770c257e2a04e1546eed35fa56;p=linux-2.6-omap-h63xx.git

KVM: x86 emulator: handle undecoded rex.b with r/m = 5 in certain cases

x86_64 does not decode rex.b in certain cases, where the r/m field = 5.

Signed-off-by: Avi Kivity <avi@qumranet.com>
---

diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
index 28082913919..3721cfddc97 100644
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -750,6 +750,7 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
 
 			switch (base_reg) {
 			case 5:
+			case 13:
 				if (c->modrm_mod != 0)
 					c->modrm_ea += c->regs[base_reg];
 				else
@@ -767,6 +768,7 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
 			}
 			break;
 		case 5:
+		case 13:
 			if (c->modrm_mod != 0)
 				c->modrm_ea += c->regs[c->modrm_rm];
 			else if (ctxt->mode == X86EMUL_MODE_PROT64)