more Win64

dlang · Aug 28, 2012 · e9ab704 · e9ab704
1 parent f29f974
commit e9ab704
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/src/backend/cg87.c b/src/backend/cg87.c
@@ -3186,11 +3186,10 @@ code *cdscale(elem *e,regm_t *pretregs)
 
 code *neg87(elem *e,regm_t *pretregs)
 {
-        regm_t retregs;
-        code *c1,*c2;
-        int op;
+        //printf("neg87()\n");
 
         assert(*pretregs);
+        int op;
         switch (e->Eoper)
         {   case OPneg:  op = 0xE0;     break;
             case OPabs:  op = 0xE1;     break;
@@ -3201,10 +3200,10 @@ code *neg87(elem *e,regm_t *pretregs)
             default:
                 assert(0);
         }
-        retregs = mST0;
-        c1 = codelem(e->E1,&retregs,FALSE);
+        regm_t retregs = mST0;
+        code *c1 = codelem(e->E1,&retregs,FALSE);
         c1 = genf2(c1,0xD9,op);                 // FCHS/FABS/FSQRT/FSIN/FCOS/FRNDINT
-        c2 = fixresult87(e,mST0,pretregs);
+        code *c2 = fixresult87(e,mST0,pretregs);
         return cat(c1,c2);
 }
 
@@ -3542,10 +3541,16 @@ code *cload87(elem *e, regm_t *pretregs)
 #if __DMC__
 __in
 {
-    assert(I32 && config.inline8087);
-    elem_debug(e);
-    assert(*pretregs & (mST01 | mPSW));
-    assert(!(*pretregs & ~(mST01 | mPSW)));
+    //printf("e = %p, *pretregs = %s)\n", e, regm_str(*pretregs));
+    //elem_print(e);
+    assert(!I16);
+    if (I32)
+    {
+        assert(config.inline8087);
+        elem_debug(e);
+        assert(*pretregs & (mST01 | mPSW));
+        assert(!(*pretregs & ~(mST01 | mPSW)));
+    }
 }
 __out (result)
 {

diff --git a/src/backend/cod1.c b/src/backend/cod1.c
@@ -2595,7 +2595,7 @@ code *cdfunc(elem *e,regm_t *pretregs)
     assert(stackpush == stackpushsave);
     if (config.exe == EX_WIN64)
     {
-        printf("np = %d, numpara = %d, stackpush = %d\n", np, numpara, stackpush);
+        //printf("np = %d, numpara = %d, stackpush = %d\n", np, numpara, stackpush);
         assert(numpara == ((np < 4) ? 4 * REGSIZE : np * REGSIZE));
     }
 

diff --git a/src/backend/cod2.c b/src/backend/cod2.c
@@ -4247,6 +4247,7 @@ code *cdabs( elem *e, regm_t *pretregs)
   tym_t tyml;
   code *c,*c1,*cg;
 
+  //printf("cdabs(e = %p, *pretregs = %s)\n", e, regm_str(*pretregs));
   if (*pretregs == 0)
         return codelem(e->E1,pretregs,FALSE);
   tyml = tybasic(e->E1->Ety);