aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Jackson <Ian.Jackson@eu.citrix.com>2011-03-09 17:04:32 +0000
committerIan Jackson <Ian.Jackson@eu.citrix.com>2011-03-09 17:04:32 +0000
commitfa1e347188686d72b3bf48600aca4110de29384d (patch)
treec3572b7bd5b4b661b98c8ee68ae6f4d681063fef
parentf797de4153a11d43dfe4887f87355a1a1c9fe22d (diff)
parent7fdbca5c773e3d5b6eede9d1b8ab872d76fbab72 (diff)
downloadxen-fa1e347188686d72b3bf48600aca4110de29384d.tar.gz
xen-fa1e347188686d72b3bf48600aca4110de29384d.tar.bz2
xen-fa1e347188686d72b3bf48600aca4110de29384d.zip
Merge
-rw-r--r--xen/arch/x86/x86_emulate/x86_emulate.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c
index 186cef2b9b..112654a7e7 100644
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
@@ -2667,35 +2667,35 @@ x86_emulate(
break;
default:
fail_if(modrm >= 0xc0);
- ea.bytes = 8;
+ ea.bytes = 4;
src = ea;
if ( (rc = ops->read(src.mem.seg, src.mem.off, &src.val,
src.bytes, ctxt)) != 0 )
goto done;
switch ( modrm_reg & 7 )
{
- case 0: /* fiadd m64i */
+ case 0: /* fiadd m32i */
emulate_fpu_insn_memsrc("fiaddl", src.val);
break;
- case 1: /* fimul m64i */
- emulate_fpu_insn_memsrc("fimul", src.val);
+ case 1: /* fimul m32i */
+ emulate_fpu_insn_memsrc("fimull", src.val);
break;
- case 2: /* ficom m64i */
+ case 2: /* ficom m32i */
emulate_fpu_insn_memsrc("ficoml", src.val);
break;
- case 3: /* ficomp m64i */
+ case 3: /* ficomp m32i */
emulate_fpu_insn_memsrc("ficompl", src.val);
break;
- case 4: /* fisub m64i */
+ case 4: /* fisub m32i */
emulate_fpu_insn_memsrc("fisubl", src.val);
break;
- case 5: /* fisubr m64i */
+ case 5: /* fisubr m32i */
emulate_fpu_insn_memsrc("fisubrl", src.val);
break;
- case 6: /* fidiv m64i */
+ case 6: /* fidiv m32i */
emulate_fpu_insn_memsrc("fidivl", src.val);
break;
- case 7: /* fidivr m64i */
+ case 7: /* fidivr m32i */
emulate_fpu_insn_memsrc("fidivrl", src.val);
break;
default: