Changeset 790

Timestamp:

12/07/10 10:39:21 (14 years ago)

Author:

walter

Message:

more 64

Files:

• branches/dmd-1.x/src/backend/cg87.c (modified) (4 diffs)
• branches/dmd-1.x/src/backend/cgen.c (modified) (1 diff)
• branches/dmd-1.x/src/backend/cod1.c (modified) (1 diff)
• branches/dmd-1.x/src/backend/el.c (modified) (1 diff)
• branches/dmd-1.x/src/interpret.c (modified) (1 diff)
• branches/dmd-1.x/src/tocsym.c (modified) (1 diff)
• trunk/src/backend/cg87.c (modified) (4 diffs)
• trunk/src/backend/cgen.c (modified) (1 diff)
• trunk/src/backend/cod1.c (modified) (1 diff)
• trunk/src/backend/el.c (modified) (1 diff)
• trunk/src/interpret.c (modified) (1 diff)
• trunk/src/tocsym.c (modified) (1 diff)

branches/dmd-1.x/src/backend/cg87.c

@@ -443 +443 @@
-            //elem_print(e);
-            break;
-        }
-        if (_8087elems[i].e == e &&
-            _8087elems[i].offset == offset)
-        {   //printf("cse found %d\n",i);
-            //elem_print(e);
-            break;
-        }
-    }
-    return i;
-}
-
-/*************************************
- * Reload common subexpression.
- */
-
-code *comsub87(elem *e,regm_t *pretregs)
-{   code *c;
-
+    //printf("comsub87(e = %p, *pretregs = %s)\n", e, regm_str(*pretregs));
-    // Look on 8087 stack
-    int i = cse_get(e, 0);
-
-    if (tycomplex(e->Ety))
-    {
-        unsigned sz = tysize(e->Ety);
-        int j = cse_get(e, sz / 2);
-        if (i >= 0 && j >= 0)
-        {
-            c = push87();
-            c = cat(c, push87());
-            c = genf2(c,0xD9,0xC0 + i);         // FLD ST(i)
-            c = genf2(c,0xD9,0xC0 + j + 1);     // FLD ST(j + 1)
-            c = cat(c,fixresult_complex87(e,mST01,pretregs));
-        }
-        else
-            // Reload
-            c = loaddata(e,pretregs);
-    }
-    else
-    {
-        if (i >= 0)
-        {
-            c = push87();
-            c = genf2(c,0xD9,0xC0 + i); // FLD ST(i)
-
+
+
+
+
-        }
-        else
-            // Reload
-            c = loaddata(e,pretregs);
-    }
-
-    freenode(e);
-    return c;
-}
-
-
-/**************************
- * Generate code to deal with floatreg.
- */
-
-code * genfltreg(code *c,unsigned opcode,unsigned reg,targ_size_t offset)
-{
-        floatreg = TRUE;
-        reflocal = TRUE;
-        if ((opcode & ~7) == 0xD8)
@@ -1535 +1539 @@
-
-/*************************
- * If op == -1, load expression e into ST0.
- * else compute (eleft op e), eleft is in ST0.
- * Must follow same logic as cmporder87();
- */
-
-code *load87(elem *e,unsigned eoffset,regm_t *pretregs,elem *eleft,int op)
-{
-        elem *e1;
-        code *ccomma,*c,*c2,*cpush;
-        code cs;
-        regm_t retregs;
-        unsigned reg,mf,mf1;
-        int opr;
-        unsigned char ldop;
-        tym_t ty;
-        int i;
-
-#if NDPP
-x%x, eleft=%p, op=%d, stackused = %d)\n",e,eoffset,*pretregs
+%s, eleft=%p, op=%d, stackused = %d)\n",e,eoffset,regm_str(*pretregs)
-#endif
-        elem_debug(e);
-        ccomma = NULL;
-        cpush = NULL;
-        if (ADDFWAIT())
-            cs.Iflags = CFwait;
-        else
-            cs.Iflags = 0;
-        cs.Irex = 0;
-        opr = oprev[op + 1];
-        ty = tybasic(e->Ety);
-        if ((ty == TYldouble || ty == TYildouble) &&
-            op != -1 && e->Eoper != OPd_ld)
-            goto Ldefault;
-        mf = (ty == TYfloat || ty == TYifloat || ty == TYcfloat) ? MFfloat : MFdouble;
-    L5:
-        switch (e->Eoper)
-        {
-            case OPcomma:
-                ccomma = docommas(&e);
@@ -1806 +1810 @@
-                    pop87();
-                    if (op == 4 || op == 6)     // sub or div
-                    {   code *cl;
-
-                        cl = code_last(c);
-                        if (cl && cl->Iop == 0xD9 && cl->Irm == 0xC9)   // FXCH ST(1)
-                        {   cl->Iop = NOP;
-                            opr = op;           // reverse operands
-                        }
-                    }
-                    c = genf2(c,0xDE,modregrm(3,opr,1));        // FopRP
-                }
-                break;
-        }
-        if (op == 3)                    // FCOMP
-        {   pop87();                    // extra pop was done
-            cg87_87topsw(c);
-        }
-        c2 = fixresult87(e,((op == 3) ? mPSW : mST0),pretregs);
-#if NDPP
-x%x, eleft=%p, op=%d, stackused = %d)\n",e,eoffset,*pretregs
+%s, eleft=%p, op=%d, stackused = %d)\n",e,eoffset,regm_str(*pretregs)
-#endif
-        return cat4(ccomma,cpush,c,c2);
-}
-
-/********************************
- * Determine if a compare is to be done forwards (return 0)
- * or backwards (return 1).
- * Must follow same logic as load87().
- */
-
-int cmporder87(elem *e)
-{
-    //printf("cmporder87(%p)\n",e);
-L1:
-        switch (e->Eoper)
-        {
-            case OPcomma:
-                e = e->E2;
-                goto L1;
-
@@ -1878 +1882 @@
-                goto ret1;
-        }
-
-ret1:   return 1;
-ret0:   return 0;
-}
-
-/*******************************
- * Perform an assignment to a long double/double/float.
- */
-
-code *eq87(elem *e,regm_t *pretregs)
-{
-        regm_t retregs;
-        code *c1,*c2;
-        code cs;
-        unsigned op1;
-        unsigned op2;
-        tym_t ty1;
-
-x%x)\n", e, *pretregs
+%s)\n", e, regm_str(*pretregs)
-        assert(e->Eoper == OPeq);
-        retregs = mST0 | (*pretregs & mPSW);
-        c1 = codelem(e->E2,&retregs,FALSE);
-        ty1 = tybasic(e->E1->Ety);
-        switch (ty1)
-        {   case TYdouble_alias:
-            case TYidouble:
-            case TYdouble:      op1 = ESC(MFdouble,1);  op2 = 3; break;
-            case TYifloat:
-            case TYfloat:       op1 = ESC(MFfloat,1);   op2 = 3; break;
-            case TYildouble:
-            case TYldouble:     op1 = 0xDB;             op2 = 7; break;
-            default:
-                assert(0);
-        }
-
+ | XMMREGS
-        {
-            if (ty1 == TYldouble || ty1 == TYildouble)
-            {
-                c1 = cat(c1,push87());
-                c1 = genf2(c1,0xD9,0xC0);       // FLD ST(0)
-                pop87();
-            }
-            else
-                op2 = 2;                        // FST e->E1
-        }
-        else
-        {                                       // FSTP e->E1
-            pop87();
-        }
-#if 0
-        // Doesn't work if ST(0) gets saved to the stack by getlvalue()
-        c2 = loadea(e->E1,&cs,op1,op2,0,0,0);
-#else
-        cs.Irex = 0;
-        cs.Iflags = 0;

branches/dmd-1.x/src/backend/cgen.c

@@ -552 +552 @@
- *      set flags based on result
- * Else if flags & 8
- *      do not disturb flags
- * Else
- *      don't care about flags
- * If flags & 1 then byte move
- * If flags & 2 then short move (for I32 and I64)
- * If flags & 4 then don't disturb unused portion of register
- * If flags & 16 then reg is a byte register AL..BH
- * If flags & 64 then 64 bit move (I64 only)
- * Returns:
- *      code (if any) generated
- */
-
-code *movregconst(code *c,unsigned reg,targ_size_t value,regm_t flags)
-{   unsigned r;
-    regm_t regm;
-    regm_t mreg;
-    targ_size_t regv;
-
-x)\n"
+d (%llx))\n", value
-#define genclrreg(a,r) genregs(a,0x31,r,r)
-
-    regm = regcon.immed.mval & mask[reg];
-    regv = regcon.immed.value[reg];
-
-    if (flags & 1)      // 8 bits
-    {   unsigned msk;
-
-        value &= 0xFF;
-        regm &= BYTEREGS;
-
-        // If we already have the right value in the right register
-        if (regm && (regv & 0xFF) == value)
-            goto L2;
-
-        if (flags & 16 && reg & 4 &&    // if an H byte register
-            regcon.immed.mval & mask[reg & 3] &&
-            (((regv = regcon.immed.value[reg & 3]) >> 8) & 0xFF) == value)
-            goto L2;
-

branches/dmd-1.x/src/backend/cod1.c

@@ -3786 +3786 @@
-        }
-        else if (sz == tysize[TYldouble])               // TYldouble
-            return load87(e,0,pretregs,NULL,-1);
-        else
-        {
-#ifdef DEBUG
-            elem_print(e);
-#endif
-            assert(0);
-        }
-        return c;
-  }
-  /* not for flags only */
-  flags = *pretregs & mPSW;             /* save original                */
-  forregs = *pretregs & (mBP | ALLREGS | mES | XMMREGS);
-  if (*pretregs & mSTACK)
-        forregs |= DOUBLEREGS;
-  if (e->Eoper == OPconst)
-  {     regm_t save;
-
-
+
+
+
+
+
-            forregs = mask[reg];
-
-        save = regcon.immed.mval;
-        c = allocreg(&forregs,&reg,tym);        /* allocate registers   */
-        regcon.immed.mval = save;               // KLUDGE!
-        if (sz <= REGSIZE)
-        {
-            if (sz == 1)
-                flags |= 1;
-            else if (!I16 && sz == SHORTSIZE &&
-                     !(mask[reg] & regcon.mvar) &&
-                     !(config.flags4 & CFG4speed)
-                    )
-                flags |= 2;
-            if (sz == 8)
-                flags |= 64;
-            if (reg >= XMM0)
-            {   /* This comes about because 0, 1, pi, etc., constants don't get stored
-                 * in the data segment, because they are x87 opcodes.
-                 * Not so efficient. We should at least do a PXOR for 0.
-                 */
-                unsigned r;
-                targ_size_t value = e->EV.Vuns;
-                if (sz == 8)
-                    value = e->EV.Vullong;
-                ce = regwithvalue(CNIL,ALLREGS,value,&r,flags);
-                flags = 0;                              // flags are already set
-                ce = genfltreg(ce,0x89,r,0);            // MOV floatreg,r
-                if (sz == 8)
-                    code_orrex(ce, REX_W);
-                assert(sz == 4 || sz == 8);             // float or double
-                unsigned op = (sz == 4) ? 0xF30F10 : 0xF20F10;
-                ce = genfltreg(ce,op,reg - XMM0,0);     // MOVSS/MOVSD XMMreg,floatreg
-            }
-            else
-e->EV.Vint
+value
-                flags = 0;                          // flags are already set
-            }
-        }
-        else if (sz < 8)        // far pointers, longs for 16 bit targets
-        {
-            targ_int msw,lsw;
-            regm_t mswflags;
-
-            msw = I32   ? e->EV.Vfp.Vseg
-                        : (e->EV.Vulong >> 16);
-            lsw = e->EV.Vfp.Voff;
-            mswflags = 0;
-            if (forregs & mES)
-            {
-                ce = movregconst(CNIL,reg,msw,0);       // MOV reg,segment
-                genregs(ce,0x8E,0,reg);                 // MOV ES,reg
-                msw = lsw;                              // MOV reg,offset
-            }
-            else
-            {

branches/dmd-1.x/src/backend/el.c

@@ -3022 +3022 @@
-                assert(0);
-    }
-    if (bit == -1)
-        value++;
-    else if (bit == 1)
-        value--;
-    return value == 0;
-}
-
-/******************************
- * Extract long double value from constant elem.
- * Silently ignore types which are not floating point values.
- */
-
-targ_ldouble el_toldouble(elem *e)
-{   targ_ldouble result;
-
-    elem_debug(e);
-    assert(cnst(e));
-#if TX86
-
-
-
+
+
+
+
-            result = e->EV.Vfloat;
-            break;
-
+
+
+
-            result = e->EV.Vdouble;
-            break;
-
+
+
-            result = e->EV.Vldouble;
-            break;
-    }
-#else
-#if !DDRT
-    switch (tysize[tybasic(typemask(e))])
-    {
-    case FLOATSIZE:             // TYfloat
-        result = e->EV.Vfloat;
-        break;
-    case DOUBLESIZE:    // TYdouble
-        result = e->EV.Vdouble;
-        break;
-#if DOUBLESIZE != LNGDBLSIZE
-    case LNGDBLSIZE:    // TYldouble
-#ifdef LNGHDBLSIZE
-    case LNGHDBLSIZE:
-#endif
-#if (TARGET_POWERPC)
-        if (config.flags & CFGldblisdbl)

branches/dmd-1.x/src/interpret.c

@@ -1328 +1328 @@
-        Dsymbol *s = v->toAlias();
-        if (s == v && !v->isStatic() && v->init)
-        {
-            ExpInitializer *ie = v->init->isExpInitializer();
-            if (ie)
-                e = ie->exp->interpret(istate);
-            else if (v->init->isVoidInitializer())
-                e = NULL;
-        }
-#if DMDV2
-        else if (s == v && (v->isConst() || v->isImmutable()) && v->init)
-#else
-        else if (s == v && v->isConst() && v->init)
-#endif
-        {   e = v->init->toExpression();
-            if (!e)
-                e = EXP_CANT_INTERPRET;
-            else if (!e->type)
-                e->type = v->type;
-        }
+#if 0 // currently fails test interpret3.d
+        else
+        {
+            error("%s cannot be interpreted at compile time");
+            e = EXP_CANT_INTERPRET;
+        }
+#endif
-    }
-    else if (declaration->isAttribDeclaration() ||
-             declaration->isTemplateMixin() ||
-             declaration->isTupleDeclaration())
-    {   // These can be made to work, too lazy now
-    error("Declaration %s is not yet implemented in CTFE", toChars());
-
-        e = EXP_CANT_INTERPRET;
-    }
-    else
-    {   // Others should not contain executable code, so are trivial to evaluate
-        e = NULL;
-    }
-#if LOG
-    printf("-DeclarationExp::interpret(%s): %p\n", toChars(), e);
-#endif
-    return e;
-}
-
-Expression *TupleExp::interpret(InterState *istate)

branches/dmd-1.x/src/tocsym.c

@@ -218 +218 @@
-            if (nestedref)
-            {
-                /* Symbol is accessed by a nested function. Make sure
-                 * it is not put in a register, and that the optimizer
-                 * assumes it is modified across function calls and pointer
-                 * dereferences.
-                 */
-                //printf("\tnested ref, not register\n");
-                type_setcv(&t, t->Tty | mTYvolatile);
-            }
-        }
-        if (storage_class & STCconst)
-        {
-            // Insert const modifiers
-            tym_t tym = 0;
-
-            if (storage_class & STCconst)
-                tym |= mTYconst;
-            type_setcv(&t, tym);
-        }
+
+        if (ident == Id::va_argsave)
+            /* __va_argsave is set outside of the realm of the optimizer,
+             * so we tell the optimizer to leave it alone
+             */
+            type_setcv(&t, t->Tty | mTYvolatile);
+
-        switch (linkage)
-        {
-            case LINKwindows:
-                m = mTYman_std;
-                break;
-
-            case LINKpascal:
-                m = mTYman_pas;
-                break;
-
-            case LINKc:
-                m = mTYman_c;
-                break;
-
-            case LINKd:
-                m = mTYman_d;
-                break;
-
-            case LINKcpp:
-                m = mTYman_cpp;

trunk/src/backend/cg87.c

@@ -443 +443 @@
-            //elem_print(e);
-            break;
-        }
-        if (_8087elems[i].e == e &&
-            _8087elems[i].offset == offset)
-        {   //printf("cse found %d\n",i);
-            //elem_print(e);
-            break;
-        }
-    }
-    return i;
-}
-
-/*************************************
- * Reload common subexpression.
- */
-
-code *comsub87(elem *e,regm_t *pretregs)
-{   code *c;
-
+    //printf("comsub87(e = %p, *pretregs = %s)\n", e, regm_str(*pretregs));
-    // Look on 8087 stack
-    int i = cse_get(e, 0);
-
-    if (tycomplex(e->Ety))
-    {
-        unsigned sz = tysize(e->Ety);
-        int j = cse_get(e, sz / 2);
-        if (i >= 0 && j >= 0)
-        {
-            c = push87();
-            c = cat(c, push87());
-            c = genf2(c,0xD9,0xC0 + i);         // FLD ST(i)
-            c = genf2(c,0xD9,0xC0 + j + 1);     // FLD ST(j + 1)
-            c = cat(c,fixresult_complex87(e,mST01,pretregs));
-        }
-        else
-            // Reload
-            c = loaddata(e,pretregs);
-    }
-    else
-    {
-        if (i >= 0)
-        {
-            c = push87();
-            c = genf2(c,0xD9,0xC0 + i); // FLD ST(i)
-
+
+
+
+
-        }
-        else
-            // Reload
-            c = loaddata(e,pretregs);
-    }
-
-    freenode(e);
-    return c;
-}
-
-
-/**************************
- * Generate code to deal with floatreg.
- */
-
-code * genfltreg(code *c,unsigned opcode,unsigned reg,targ_size_t offset)
-{
-        floatreg = TRUE;
-        reflocal = TRUE;
-        if ((opcode & ~7) == 0xD8)
@@ -1535 +1539 @@
-
-/*************************
- * If op == -1, load expression e into ST0.
- * else compute (eleft op e), eleft is in ST0.
- * Must follow same logic as cmporder87();
- */
-
-code *load87(elem *e,unsigned eoffset,regm_t *pretregs,elem *eleft,int op)
-{
-        elem *e1;
-        code *ccomma,*c,*c2,*cpush;
-        code cs;
-        regm_t retregs;
-        unsigned reg,mf,mf1;
-        int opr;
-        unsigned char ldop;
-        tym_t ty;
-        int i;
-
-#if NDPP
-x%x, eleft=%p, op=%d, stackused = %d)\n",e,eoffset,*pretregs
+%s, eleft=%p, op=%d, stackused = %d)\n",e,eoffset,regm_str(*pretregs)
-#endif
-        elem_debug(e);
-        ccomma = NULL;
-        cpush = NULL;
-        if (ADDFWAIT())
-            cs.Iflags = CFwait;
-        else
-            cs.Iflags = 0;
-        cs.Irex = 0;
-        opr = oprev[op + 1];
-        ty = tybasic(e->Ety);
-        if ((ty == TYldouble || ty == TYildouble) &&
-            op != -1 && e->Eoper != OPd_ld)
-            goto Ldefault;
-        mf = (ty == TYfloat || ty == TYifloat || ty == TYcfloat) ? MFfloat : MFdouble;
-    L5:
-        switch (e->Eoper)
-        {
-            case OPcomma:
-                ccomma = docommas(&e);
@@ -1806 +1810 @@
-                    pop87();
-                    if (op == 4 || op == 6)     // sub or div
-                    {   code *cl;
-
-                        cl = code_last(c);
-                        if (cl && cl->Iop == 0xD9 && cl->Irm == 0xC9)   // FXCH ST(1)
-                        {   cl->Iop = NOP;
-                            opr = op;           // reverse operands
-                        }
-                    }
-                    c = genf2(c,0xDE,modregrm(3,opr,1));        // FopRP
-                }
-                break;
-        }
-        if (op == 3)                    // FCOMP
-        {   pop87();                    // extra pop was done
-            cg87_87topsw(c);
-        }
-        c2 = fixresult87(e,((op == 3) ? mPSW : mST0),pretregs);
-#if NDPP
-x%x, eleft=%p, op=%d, stackused = %d)\n",e,eoffset,*pretregs
+%s, eleft=%p, op=%d, stackused = %d)\n",e,eoffset,regm_str(*pretregs)
-#endif
-        return cat4(ccomma,cpush,c,c2);
-}
-
-/********************************
- * Determine if a compare is to be done forwards (return 0)
- * or backwards (return 1).
- * Must follow same logic as load87().
- */
-
-int cmporder87(elem *e)
-{
-    //printf("cmporder87(%p)\n",e);
-L1:
-        switch (e->Eoper)
-        {
-            case OPcomma:
-                e = e->E2;
-                goto L1;
-
@@ -1878 +1882 @@
-                goto ret1;
-        }
-
-ret1:   return 1;
-ret0:   return 0;
-}
-
-/*******************************
- * Perform an assignment to a long double/double/float.
- */
-
-code *eq87(elem *e,regm_t *pretregs)
-{
-        regm_t retregs;
-        code *c1,*c2;
-        code cs;
-        unsigned op1;
-        unsigned op2;
-        tym_t ty1;
-
-x%x)\n", e, *pretregs
+%s)\n", e, regm_str(*pretregs)
-        assert(e->Eoper == OPeq);
-        retregs = mST0 | (*pretregs & mPSW);
-        c1 = codelem(e->E2,&retregs,FALSE);
-        ty1 = tybasic(e->E1->Ety);
-        switch (ty1)
-        {   case TYdouble_alias:
-            case TYidouble:
-            case TYdouble:      op1 = ESC(MFdouble,1);  op2 = 3; break;
-            case TYifloat:
-            case TYfloat:       op1 = ESC(MFfloat,1);   op2 = 3; break;
-            case TYildouble:
-            case TYldouble:     op1 = 0xDB;             op2 = 7; break;
-            default:
-                assert(0);
-        }
-
+ | XMMREGS
-        {
-            if (ty1 == TYldouble || ty1 == TYildouble)
-            {
-                c1 = cat(c1,push87());
-                c1 = genf2(c1,0xD9,0xC0);       // FLD ST(0)
-                pop87();
-            }
-            else
-                op2 = 2;                        // FST e->E1
-        }
-        else
-        {                                       // FSTP e->E1
-            pop87();
-        }
-#if 0
-        // Doesn't work if ST(0) gets saved to the stack by getlvalue()
-        c2 = loadea(e->E1,&cs,op1,op2,0,0,0);
-#else
-        cs.Irex = 0;
-        cs.Iflags = 0;

trunk/src/backend/cgen.c

@@ -552 +552 @@
- *      set flags based on result
- * Else if flags & 8
- *      do not disturb flags
- * Else
- *      don't care about flags
- * If flags & 1 then byte move
- * If flags & 2 then short move (for I32 and I64)
- * If flags & 4 then don't disturb unused portion of register
- * If flags & 16 then reg is a byte register AL..BH
- * If flags & 64 then 64 bit move (I64 only)
- * Returns:
- *      code (if any) generated
- */
-
-code *movregconst(code *c,unsigned reg,targ_size_t value,regm_t flags)
-{   unsigned r;
-    regm_t regm;
-    regm_t mreg;
-    targ_size_t regv;
-
-x)\n"
+d (%llx))\n", value
-#define genclrreg(a,r) genregs(a,0x31,r,r)
-
-    regm = regcon.immed.mval & mask[reg];
-    regv = regcon.immed.value[reg];
-
-    if (flags & 1)      // 8 bits
-    {   unsigned msk;
-
-        value &= 0xFF;
-        regm &= BYTEREGS;
-
-        // If we already have the right value in the right register
-        if (regm && (regv & 0xFF) == value)
-            goto L2;
-
-        if (flags & 16 && reg & 4 &&    // if an H byte register
-            regcon.immed.mval & mask[reg & 3] &&
-            (((regv = regcon.immed.value[reg & 3]) >> 8) & 0xFF) == value)
-            goto L2;
-

trunk/src/backend/cod1.c

@@ -3786 +3786 @@
-        }
-        else if (sz == tysize[TYldouble])               // TYldouble
-            return load87(e,0,pretregs,NULL,-1);
-        else
-        {
-#ifdef DEBUG
-            elem_print(e);
-#endif
-            assert(0);
-        }
-        return c;
-  }
-  /* not for flags only */
-  flags = *pretregs & mPSW;             /* save original                */
-  forregs = *pretregs & (mBP | ALLREGS | mES | XMMREGS);
-  if (*pretregs & mSTACK)
-        forregs |= DOUBLEREGS;
-  if (e->Eoper == OPconst)
-  {     regm_t save;
-
-
+
+
+
+
+
-            forregs = mask[reg];
-
-        save = regcon.immed.mval;
-        c = allocreg(&forregs,&reg,tym);        /* allocate registers   */
-        regcon.immed.mval = save;               // KLUDGE!
-        if (sz <= REGSIZE)
-        {
-            if (sz == 1)
-                flags |= 1;
-            else if (!I16 && sz == SHORTSIZE &&
-                     !(mask[reg] & regcon.mvar) &&
-                     !(config.flags4 & CFG4speed)
-                    )
-                flags |= 2;
-            if (sz == 8)
-                flags |= 64;
-            if (reg >= XMM0)
-            {   /* This comes about because 0, 1, pi, etc., constants don't get stored
-                 * in the data segment, because they are x87 opcodes.
-                 * Not so efficient. We should at least do a PXOR for 0.
-                 */
-                unsigned r;
-                targ_size_t value = e->EV.Vuns;
-                if (sz == 8)
-                    value = e->EV.Vullong;
-                ce = regwithvalue(CNIL,ALLREGS,value,&r,flags);
-                flags = 0;                              // flags are already set
-                ce = genfltreg(ce,0x89,r,0);            // MOV floatreg,r
-                if (sz == 8)
-                    code_orrex(ce, REX_W);
-                assert(sz == 4 || sz == 8);             // float or double
-                unsigned op = (sz == 4) ? 0xF30F10 : 0xF20F10;
-                ce = genfltreg(ce,op,reg - XMM0,0);     // MOVSS/MOVSD XMMreg,floatreg
-            }
-            else
-e->EV.Vint
+value
-                flags = 0;                          // flags are already set
-            }
-        }
-        else if (sz < 8)        // far pointers, longs for 16 bit targets
-        {
-            targ_int msw,lsw;
-            regm_t mswflags;
-
-            msw = I32   ? e->EV.Vfp.Vseg
-                        : (e->EV.Vulong >> 16);
-            lsw = e->EV.Vfp.Voff;
-            mswflags = 0;
-            if (forregs & mES)
-            {
-                ce = movregconst(CNIL,reg,msw,0);       // MOV reg,segment
-                genregs(ce,0x8E,0,reg);                 // MOV ES,reg
-                msw = lsw;                              // MOV reg,offset
-            }
-            else
-            {

trunk/src/backend/el.c

@@ -3022 +3022 @@
-                assert(0);
-    }
-    if (bit == -1)
-        value++;
-    else if (bit == 1)
-        value--;
-    return value == 0;
-}
-
-/******************************
- * Extract long double value from constant elem.
- * Silently ignore types which are not floating point values.
- */
-
-targ_ldouble el_toldouble(elem *e)
-{   targ_ldouble result;
-
-    elem_debug(e);
-    assert(cnst(e));
-#if TX86
-
-
-
+
+
+
+
-            result = e->EV.Vfloat;
-            break;
-
+
+
+
-            result = e->EV.Vdouble;
-            break;
-
+
+
-            result = e->EV.Vldouble;
-            break;
-    }
-#else
-#if !DDRT
-    switch (tysize[tybasic(typemask(e))])
-    {
-    case FLOATSIZE:             // TYfloat
-        result = e->EV.Vfloat;
-        break;
-    case DOUBLESIZE:    // TYdouble
-        result = e->EV.Vdouble;
-        break;
-#if DOUBLESIZE != LNGDBLSIZE
-    case LNGDBLSIZE:    // TYldouble
-#ifdef LNGHDBLSIZE
-    case LNGHDBLSIZE:
-#endif
-#if (TARGET_POWERPC)
-        if (config.flags & CFGldblisdbl)

trunk/src/interpret.c

@@ -1328 +1328 @@
-        Dsymbol *s = v->toAlias();
-        if (s == v && !v->isStatic() && v->init)
-        {
-            ExpInitializer *ie = v->init->isExpInitializer();
-            if (ie)
-                e = ie->exp->interpret(istate);
-            else if (v->init->isVoidInitializer())
-                e = NULL;
-        }
-#if DMDV2
-        else if (s == v && (v->isConst() || v->isImmutable()) && v->init)
-#else
-        else if (s == v && v->isConst() && v->init)
-#endif
-        {   e = v->init->toExpression();
-            if (!e)
-                e = EXP_CANT_INTERPRET;
-            else if (!e->type)
-                e->type = v->type;
-        }
+#if 0 // currently fails test interpret3.d
+        else
+        {
+            error("%s cannot be interpreted at compile time");
+            e = EXP_CANT_INTERPRET;
+        }
+#endif
-    }
-    else if (declaration->isAttribDeclaration() ||
-             declaration->isTemplateMixin() ||
-             declaration->isTupleDeclaration())
-    {   // These can be made to work, too lazy now
-    error("Declaration %s is not yet implemented in CTFE", toChars());
-
-        e = EXP_CANT_INTERPRET;
-    }
-    else
-    {   // Others should not contain executable code, so are trivial to evaluate
-        e = NULL;
-    }
-#if LOG
-    printf("-DeclarationExp::interpret(%s): %p\n", toChars(), e);
-#endif
-    return e;
-}
-
-Expression *TupleExp::interpret(InterState *istate)

trunk/src/tocsym.c

@@ -219 +219 @@
-            s->Sclass = SCextern;
-            s->Sfl = FLextern;
-            slist_add(s);
-        }
-        else
-        {
-            s->Sclass = SCauto;
-            s->Sfl = FLauto;
-
-            if (nestedrefs.dim)
-            {
-                /* Symbol is accessed by a nested function. Make sure
-                 * it is not put in a register, and that the optimizer
-                 * assumes it is modified across function calls and pointer
-                 * dereferences.
-                 */
-                //printf("\tnested ref, not register\n");
-                type_setcv(&t, t->Tty | mTYvolatile);
-            }
-        }
+
+        if (ident == Id::va_argsave)
+            /* __va_argsave is set outside of the realm of the optimizer,
+             * so we tell the optimizer to leave it alone
+             */
+            type_setcv(&t, t->Tty | mTYvolatile);
-
-        mangle_t m = 0;
-        switch (linkage)
-        {
-            case LINKwindows:
-                m = mTYman_std;
-                break;
-
-            case LINKpascal:
-                m = mTYman_pas;
-                break;
-
-            case LINKc:
-                m = mTYman_c;
-                break;
-
-            case LINKd:
-                m = mTYman_d;
-                break;
-