From: Julian Seward <jseward@acm.org>
Date: Fri, 4 May 2007 10:48:12 +0000 (+0000)
Subject: Merge r1761 (Handle x87 FCOMP.)
X-Git-Tag: svn/VALGRIND_3_2_3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58161ba7e89e0710edebee79dae5388891b7fb63;p=thirdparty%2Fvalgrind.git

Merge r1761 (Handle x87 FCOMP.)


git-svn-id: svn://svn.valgrind.org/vex/branches/VEX_3_2_BRANCH@1762
---

diff --git a/VEX/priv/guest-amd64/toIR.c b/VEX/priv/guest-amd64/toIR.c
index a3c28bd511..d042787ce1 100644
--- a/VEX/priv/guest-amd64/toIR.c
+++ b/VEX/priv/guest-amd64/toIR.c
@@ -4483,22 +4483,22 @@ ULong dis_FPU ( /*OUT*/Bool* decode_ok,
                    )));
                break;
 
-//.. #if 1
-//..             /* Dunno if this is right */
-//..             case 0xD8 ... 0xDF: /* FCOMP %st(?),%st(0) */
-//..                r_dst = (UInt)modrm - 0xD8;
-//..                DIP("fcomp %%st(0),%%st(%d)\n", r_dst);
-//..                /* This forces C1 to zero, which isn't right. */
-//..                put_C3210( 
-//..                    binop( Iop_And32,
-//..                           binop(Iop_Shl32, 
-//..                                 binop(Iop_CmpF64, get_ST(0), get_ST(r_dst)),
-//..                                 mkU8(8)),
-//..                           mkU32(0x4500)
-//..                    ));
-//..                fp_pop();
-//..                break;
-//.. #endif
+            /* Dunno if this is right */
+            case 0xD8 ... 0xDF: /* FCOMP %st(?),%st(0) */
+               r_dst = (UInt)modrm - 0xD8;
+               DIP("fcomp %%st(0),%%st(%d)\n", r_dst);
+               /* This forces C1 to zero, which isn't right. */
+               put_C3210( 
+                   unop(Iop_32Uto64,
+                   binop( Iop_And32,
+                          binop(Iop_Shl32, 
+                                binop(Iop_CmpF64, get_ST(0), get_ST(r_dst)),
+                                mkU8(8)),
+                          mkU32(0x4500)
+                   )));
+               fp_pop();
+               break;
+
             case 0xE0 ... 0xE7: /* FSUB %st(?),%st(0) */
                fp_do_op_ST_ST ( "sub", Iop_SubF64, modrm - 0xE0, 0, False );
                break;