Use correct opcodes for moving cfloat from st->xmm and xmm->st

dlang · Mar 17, 2012 · 3c28495 · 3c28495
1 parent 778aea7
commit 3c28495
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/backend/cg87.c b/src/backend/cg87.c
@@ -3456,29 +3456,33 @@ code *fixresult_complex87(elem *e,regm_t retregs,regm_t *pretregs)
     else if ((tym == TYcfloat || tym == TYcdouble) &&
              *pretregs & (mXMM0|mXMM1) && retregs & mST01)
     {
+        unsigned xop = xmmload(tym == TYcfloat ? TYfloat : TYdouble);
+        unsigned mf = tym == TYcfloat ? MFfloat : MFdouble;
         if (*pretregs & mPSW && !(retregs & mPSW))
             c1 = genctst(c1,e,0);               // FTST
         pop87();
-        c1 = genfltreg(c1, ESC(MFdouble,1),3,0); // FSTP floatreg
+        c1 = genfltreg(c1, ESC(mf,1),3,0); // FSTP floatreg
         genfwait(c1);
         c2 = getregs(mXMM0|mXMM1);
-        c2 = genfltreg(c2, 0xF20F10, XMM1 - XMM0, 0);    // MOVD XMM1,floatreg
+        c2 = genfltreg(c2, xop, XMM1 - XMM0, 0);    // LODS(SD) XMM1,floatreg
 
         pop87();
-        c2 = genfltreg(c2, ESC(MFdouble,1),3,0); // FSTP floatreg
+        c2 = genfltreg(c2, ESC(mf,1),3,0); // FSTP floatreg
         genfwait(c2);
-        c2 = genfltreg(c2, 0xF20F10, XMM0 - XMM0, 0);    // MOVD XMM0,floatreg
+        c2 = genfltreg(c2, xop, XMM0 - XMM0, 0);    // LODS(SD) XMM0,floatreg
     }
     else if ((tym == TYcfloat || tym == TYcdouble) &&
              retregs & (mXMM0|mXMM1) && *pretregs & mST01)
     {
+        unsigned xop = xmmstore(tym == TYcfloat ? TYfloat : TYdouble);
+        unsigned fop = tym == TYcfloat ? 0xD9 : 0xDD;
         c1 = push87();
-        c1 = genfltreg(c1, 0xF20F11, XMM0-XMM0, 0);        // MOVD floatreg, XMM0
-        genfltreg(c1, 0xDD, 0, 0);              // FLD double ptr floatreg
+        c1 = genfltreg(c1, xop, XMM0-XMM0, 0); // STOS(SD) floatreg, XMM0
+        genfltreg(c1, fop, 0, 0);              // FLD float/double ptr floatreg
 
         c2 = push87();
-        c2 = genfltreg(c2, 0xF20F11, XMM1-XMM0, 0);        // MOV floatreg, XMM1
-        genfltreg(c2, 0xDD, 0, 0);              // FLD double ptr floatreg
+        c2 = genfltreg(c2, xop, XMM1-XMM0, 0); // STOS(SD) floatreg, XMM1
+        genfltreg(c2, fop, 0, 0);              // FLD float/double ptr floatreg
 
         if (*pretregs & mPSW)
             c2 = genctst(c2,e,0);               // FTST