Changeset 812

Timestamp:

12/23/10 04:52:15 (14 years ago)

Author:

walter

Message:

harmonize some 64 bit patches from dmd1, other fixes from Brad

Files:

• trunk/src/e2ir.c (modified) (2 diffs)
• trunk/src/expression.c (modified) (4 diffs)
• trunk/src/func.c (modified) (2 diffs)
• trunk/src/imphint.c (modified) (1 diff)
• trunk/src/mtype.c (modified) (1 diff)
• trunk/src/toir.c (modified) (1 diff)

trunk/src/e2ir.c

@@ -2450 +2450 @@
-    else
-        e = toElemBin(irs, eop);
-
-    return e;
-}
-
-
-/***************************************
- */
-
-elem *InExp::toElem(IRState *irs)
-{   elem *e;
-    elem *key = e1->toElem(irs);
-    elem *aa = e2->toElem(irs);
-    elem *ep;
-    elem *keyti;
-    TypeAArray *taa = (TypeAArray *)e2->type->toBasetype();
-
-
-    // set to:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    keyti = taa->index->getInternalTypeInfo(NULL)->toElem(irs);
-    ep = el_params(key, keyti, aa, NULL);
-    e = el_bin(OPcall, type->totym(), el_var(s), ep);
-
-    el_setLoc(e,loc);
-    return e;
-}
-
-/***************************************
- */
-
-elem *RemoveExp::toElem(IRState *irs)
-{   elem *e;
-    Type *tb = e1->type->toBasetype();
-    assert(tb->ty == Taarray);
-    TypeAArray *taa = (TypeAArray *)tb;
-    elem *ea = e1->toElem(irs);
-    elem *ekey = e2->toElem(irs);
-    elem *ep;
-    elem *keyti;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    keyti = taa->index->getInternalTypeInfo(NULL)->toElem(irs);
-    ep = el_params(ekey, keyti, ea, NULL);
-    e = el_bin(OPcall, TYnptr, el_var(s), ep);
-
-    el_setLoc(e,loc);
-    return e;
-}
-
-/***************************************
- */
-
-elem *AssignExp::toElem(IRState *irs)
-{
-    //printf("AssignExp::toElem('%s')\n", toChars());
-    Type *t1b = e1->type->toBasetype();
-
-    // Look for array.length = n
-    if (e1->op == TOKarraylength)
-    {
-        // Generate:
@@ -4367 +4385 @@
-        e = el_combine(einit, e);
-    }
-    else if (t1->ty == Tsarray)
-    {
-        e = sarray_toDarray(loc, t1, NULL, e);
-    }
-    el_setLoc(e,loc);
-    return e;
-}
-
-elem *IndexExp::toElem(IRState *irs)
-{   elem *e;
-    elem *n1 = e1->toElem(irs);
-    elem *eb = NULL;
-
-    //printf("IndexExp::toElem() %s\n", toChars());
-    Type *t1 = e1->type->toBasetype();
-    if (t1->ty == Taarray)
-    {
-        // set to:
-(aa, keyti, valuesize, index
+X(aa, keyti, valuesize, &key
-
-        TypeAArray *taa = (TypeAArray *)t1;
-        elem *keyti;
-        elem *ep;
-        int vsize = taa->next->size();
-        Symbol *s;
-
-        // n2 becomes the index, also known as the key
-        elem *n2 = e2->toElem(irs);
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        //printf("valuesize: "); elem_print(valuesize);
-        if (modifiable)
-        {
-            n1 = el_una(OPaddr, TYnptr, n1);
-
+I64 ? "GetX" : 
-        }
-        else
-        {
-
+I64 ? "GetRvalueX" : 
-        }
-        //printf("taa->index = %s\n", taa->index->toChars());
-
+elem* 
-        //keyti = taa->index->getTypeInfo(NULL)->toElem(irs);
-        //printf("keyti:\n");
-        //elem_print(keyti);
-
+lem* e
-        e = el_bin(OPcall, TYnptr, el_var(s), ep);
-        if (irs->arrayBoundsCheck())
-        {
-            elem *ea;
-
-            elem *n = el_same(&e);
-
-            // Construct: ((e || ModuleAssert(line)),n)
-            Symbol *sassert = irs->blx->module->toModuleArray();
-            ea = el_bin(OPcall,TYvoid,el_var(sassert),
-                el_long(TYint, loc.linnum));
-            e = el_bin(OPoror,TYvoid,e,ea);
-            e = el_bin(OPcomma, TYnptr, e, n);
-        }
-        e = el_una(OPind, type->totym(), e);
-        if (tybasic(e->Ety) == TYstruct)
-            e->ET = type->toCtype();
-    }
-    else
-    {

trunk/src/expression.c

@@ -5322 +5322 @@
-}
-
-Expression *BinExp::semantic(Scope *sc)
-{
-#if LOGSEMANTIC
-    printf("BinExp::semantic('%s')\n", toChars());
-#endif
-    e1 = e1->semantic(sc);
-    if (!e1->type &&
-        !(op == TOKassign && e1->op == TOKdottd))       // a.template = e2
-    {
-        error("%s has no value", e1->toChars());
-        return new ErrorExp();
-    }
-    e2 = e2->semantic(sc);
-    if (!e2->type)
-    {
-        error("%s has no value", e2->toChars());
-        return new ErrorExp();
-    }
+    if (e1->op == TOKerror || e2->op == TOKerror)
+        return new ErrorExp();
-    return this;
-}
-
-Expression *BinExp::semanticp(Scope *sc)
-{
-    BinExp::semantic(sc);
-    e1 = resolveProperties(sc, e1);
-    e2 = resolveProperties(sc, e2);
-    return this;
-}
-
-int BinExp::checkSideEffect(int flag)
-{
-    if (op == TOKplusplus ||
-           op == TOKminusminus ||
-           op == TOKassign ||
-           op == TOKconstruct ||
-           op == TOKblit ||
-           op == TOKaddass ||
-           op == TOKminass ||
@@ -8528 +8530 @@
-    //printf("IndexExp::IndexExp('%s')\n", toChars());
-    lengthVar = NULL;
-    modifiable = 0;     // assume it is an rvalue
-}
-
-Expression *IndexExp::semantic(Scope *sc)
-{   Expression *e;
-    BinExp *b;
-    UnaExp *u;
-    Type *t1;
-    ScopeDsymbol *sym;
-
-#if LOGSEMANTIC
-    printf("IndexExp::semantic('%s')\n", toChars());
-#endif
-    if (type)
-        return this;
-    if (!e1->type)
-        e1 = e1->semantic(sc);
-    assert(e1->type);           // semantic() should already be run on it
+    if (e1->op == TOKerror)
+        goto Lerr;
-    e = this;
-
-    // Note that unlike C we do not implement the int[ptr]
-
-    t1 = e1->type->toBasetype();
-
-    if (t1->ty == Tsarray || t1->ty == Tarray || t1->ty == Ttuple)
-    {   // Create scope for 'length' variable
-        sym = new ArrayScopeSymbol(sc, this);
-        sym->loc = loc;
-        sym->parent = sc->scopesym;
-        sc = sc->push(sym);
-    }
-
-    e2 = e2->semantic(sc);
-    if (!e2->type)
-    {
-        error("%s has no value", e2->toChars());
-        goto Lerr;
-    }
@@ -8637 +8641 @@
-                assert(0);
-
-            if (index < length)
-            {
-
-                if (e1->op == TOKtuple)
-                    e = (Expression *)te->exps->data[(size_t)index];
-                else
-                    e = new TypeExp(e1->loc, Parameter::getNth(tup->arguments, (size_t)index)->type);
-            }
-            else
-            {
-                error("array index [%ju] is outside array bounds [0 .. %zu]",
-                        index, length);
-                e = e1;
-            }
-            break;
-        }
-
-        default:
+            if (e1->op == TOKerror)
+                goto Lerr;
-            error("%s must be an array or pointer type, not %s",
-                e1->toChars(), e1->type->toChars());
-        case Terror:
-            goto Lerr;
-    }
-    return e;
-
-Lerr:
-    return new ErrorExp();
-}
-
-#if DMDV2
-int IndexExp::isLvalue()
-{
-    return 1;
-}
-#endif
-
-Expression *IndexExp::toLvalue(Scope *sc, Expression *e)
-{
@@ -8924 +8930 @@
-            // Rewrite (a[i..j] = value) to (a.opSliceAssign(value, i, j))
-            if (search_function(ad, Id::sliceass))
-            {   Expression *e = new DotIdExp(loc, ae->e1, Id::sliceass);
-                Expressions *a = new Expressions();
-
-                a->push(e2);
-                if (ae->lwr)
-                {   a->push(ae->lwr);
-                    assert(ae->upr);
-                    a->push(ae->upr);
-                }
-                else
-                    assert(!ae->upr);
-                e = new CallExp(loc, e, a);
-                e = e->semantic(sc);
-                return e;
-            }
-        }
-    }
-
-
+
+
+
-
-    if (e1->op == TOKdottd)
-    {   // Rewrite a.b=e2, when b is a template, as a.b(e2)
-        Expression *e = new CallExp(loc, e1, e2);
-        e = e->semantic(sc);
-        return e;
-    }
-
-    e2 = resolveProperties(sc, e2);
-    assert(e1->type);
-
-    /* Rewrite tuple assignment as a tuple of assignments.
-     */
-    if (e1->op == TOKtuple && e2->op == TOKtuple)
-    {   TupleExp *tup1 = (TupleExp *)e1;
-        TupleExp *tup2 = (TupleExp *)e2;
-        size_t dim = tup1->exps->dim;
-        if (dim != tup2->exps->dim)
-        {
-            error("mismatched tuple lengths, %d and %d", (int)dim, (int)tup2->exps->dim);

trunk/src/func.c

@@ -912 +912 @@
-        {
-            /* The 'this' for a nested function is the link to the
-             * enclosing function's stack frame.
-             * Note that nested functions and member functions are disjoint.
-             */
-            VarDeclaration *v = new ThisDeclaration(loc, Type::tvoid->pointerTo());
-            v->storage_class |= STCparameter;
-            v->semantic(sc2);
-            if (!sc2->insert(v))
-                assert(0);
-            v->parent = this;
-            vthis = v;
-        }
-
-        // Declare hidden variable _arguments[] and _argptr
-        if (f->varargs == 1)
-        {
-#if TARGET_NET
-        varArgs(sc2, f, argptr, _arguments);
-#else
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            if (f->linkage == LINKd)
-            {   // Declare _arguments[]
-#if BREAKABI
-                v_arguments = new VarDeclaration(0, Type::typeinfotypelist->type, Id::_arguments_typeinfo, NULL);
-                v_arguments->storage_class = STCparameter;
-                v_arguments->semantic(sc2);
-                sc2->insert(v_arguments);
-                v_arguments->parent = this;
-
-                //t = Type::typeinfo->type->constOf()->arrayOf();
-                t = Type::typeinfo->type->arrayOf();
-                _arguments = new VarDeclaration(0, t, Id::_arguments, NULL);
-                _arguments->semantic(sc2);
-                sc2->insert(_arguments);
-                _arguments->parent = this;
-#else
-                t = Type::typeinfo->type->arrayOf();
-                v_arguments = new VarDeclaration(0, t, Id::_arguments, NULL);
-                v_arguments->storage_class = STCparameter | STCin;
-                v_arguments->semantic(sc2);
-                sc2->insert(v_arguments);
-                v_arguments->parent = this;
-#endif
-            }
-            if (f->linkage == LINKd || (parameters && parameters->dim))
-            {   // Declare _argptr
-#if IN_GCC
-                t = d_gcc_builtin_va_list_d_type;
-#else
-                t = Type::tvoid->pointerTo();
-#endif
-                argptr = new VarDeclaration(0, t, Id::_argptr, NULL);
-                argptr->semantic(sc2);
-                sc2->insert(argptr);
-                argptr->parent = this;
-            }
-#endif
-        }
-        if (global.params.isX86_64 && f->varargs && f->linkage == LINKc)
-        {   // Declare save area for varargs registers
-            Type *t = new TypeIdentifier(loc, Id::va_argsave_t);
-            t = t->semantic(loc, sc);
-            if (t == Type::terror)
-                error("must import std.c.stdarg to use variadic functions");
-            else
-            {
-                v_argsave = new VarDeclaration(loc, t, Id::va_argsave, NULL);
-                v_argsave->semantic(sc2);
-                sc2->insert(v_argsave);
-                v_argsave->parent = this;
-            }
-        }
-
-#if 0
-        // Propagate storage class from tuple parameters to their element-parameters.
-        if (f->parameters)
-        {
-            for (size_t i = 0; i < f->parameters->dim; i++)
-            {   Parameter *arg = (Parameter *)f->parameters->data[i];
-
-                //printf("[%d] arg->type->ty = %d %s\n", i, arg->type->ty, arg->type->toChars());
-                if (arg->type->ty == Ttuple)
-                {   TypeTuple *t = (TypeTuple *)arg->type;
-                    size_t dim = Parameter::dim(t->arguments);
-                    for (size_t j = 0; j < dim; j++)
-                    {   Parameter *narg = Parameter::getNth(t->arguments, j);
-                        narg->storageClass = arg->storageClass;
-                    }
-                }
-            }
-        }
@@ -1367 +1368 @@
-            Statements *a = new Statements();
-
-            // Merge in initialization of 'out' parameters
-            if (parameters)
-            {   for (size_t i = 0; i < parameters->dim; i++)
-                {
-                    VarDeclaration *v = (VarDeclaration *)parameters->data[i];
-                    if (v->storage_class & STCout)
-                    {
-                        assert(v->init);
-                        ExpInitializer *ie = v->init->isExpInitializer();
-                        assert(ie);
-                        if (ie->exp->op == TOKconstruct)
-                            ie->exp->op = TOKassign; // construction occured in parameter processing
-                        a->push(new ExpStatement(0, ie->exp));
-                    }
-                }
-            }
-
-            if (argptr)
- to point past non-variadic arg
+
-#if IN_GCC
-                // Handled in FuncDeclaration::toObjFile
-                v_argptr = argptr;
-                v_argptr->init = new VoidInitializer(loc);
-#else
-                Type *t = argptr->type;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                }
-                else
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#endif
-            }
-
-            if (_arguments)
-            {
-                /* Advance to elements[] member of TypeInfo_Tuple with:
-                 *  _arguments = v_arguments.elements;
-                 */
-                Expression *e = new VarExp(0, v_arguments);
-                e = new DotIdExp(0, e, Id::elements);
-                Expression *e1 = new VarExp(0, _arguments);
-                e = new ConstructExp(0, e1, e);
-                e = e->semantic(sc2);
-                a->push(new ExpStatement(0, e));
-            }
-
-            // Merge contracts together with body into one compound statement
-
-#ifdef _DH
-            if (frequire && global.params.useIn)

trunk/src/imphint.c

@@ -29 +29 @@
-{
-#if DMDV1
-    static const char *modules[] =
-    {   "std.c.stdio",
-        "std.stdio",
-        "std.math",
-        "std.c.stdarg",
-    };
-    static const char *names[] =
-    {
-        "printf", NULL,
-        "writefln", NULL,
-        "sin", "cos", "sqrt", "fabs", NULL,
-        "__va_argsave_t", NULL,
-    };
-#else
-    static const char *modules[] =
-    {   "core.stdc.stdio",
-        "std.stdio",
-        "std.math",
-std.c.std
+core.var
-    };
-    static const char *names[] =
-    {
-        "printf", NULL,
-        "writeln", NULL,
-        "sin", "cos", "sqrt", "fabs", NULL,
-        "__va_argsave_t", NULL,
-    };
-#endif
-    int m = 0;
-    for (int n = 0; n < sizeof(names)/sizeof(names[0]); n++)
-    {
-        const char *p = names[n];
-        if (p == NULL)
-        {   m++;
-            continue;
-        }
-        assert(m < sizeof(modules)/sizeof(modules[0]));
-        if (strcmp(s, p) == 0)
-            return modules[m];

trunk/src/mtype.c

@@ -1703 +1703 @@
-        }
-        else
-            s = deco;
-        e = new StringExp(loc, (char *)s, strlen(s), 'c');
-        Scope sc;
-        e = e->semantic(&sc);
-    }
-    else if (ident == Id::stringof)
-    {   char *s = toChars();
-        e = new StringExp(loc, s, strlen(s), 'c');
-        Scope sc;
-        e = e->semantic(&sc);
-    }
-    else
-    {
-        Dsymbol *s = NULL;
-        if (ty == Tstruct || ty == Tclass || ty == Tenum || ty == Ttypedef)
-            s = toDsymbol(NULL);
-        if (s)
-            s = s->search_correct(ident);
-
-
-
-
+
+
+
+
+
+
+
-        e = new ErrorExp();
-    }
-    return e;
-}
-
-Expression *Type::dotExp(Scope *sc, Expression *e, Identifier *ident)
-{   VarDeclaration *v = NULL;
-
-#if LOGDOTEXP
-    printf("Type::dotExp(e = '%s', ident = '%s')\n", e->toChars(), ident->toChars());
-#endif
-    if (e->op == TOKdotvar)
-    {
-        DotVarExp *dv = (DotVarExp *)e;
-        v = dv->var->isVarDeclaration();
-    }
-    else if (e->op == TOKvar)
-    {
-        VarExp *ve = (VarExp *)e;
-        v = ve->var->isVarDeclaration();

trunk/src/toir.c

@@ -424 +424 @@
-        "9intrinsic4outpFkhZh",
-        "9intrinsic5bswapFkZk",
-        "9intrinsic5outplFkkZk",
-        "9intrinsic5outpwFktZt",
-#elif DMDV2
-        /* The names are mangled differently because of the pure and
-         * nothrow attributes.
-         */
-        "4math3cosFNaNbNfeZe",
-        "4math3sinFNaNbNfeZe",
-        "4math4fabsFNaNbNfeZe",
-        "4math4rintFNaNbNfeZe",
-        "4math4sqrtFNaNbNfdZd",
-        "4math4sqrtFNaNbNfeZe",
-        "4math4sqrtFNaNbNffZf",
-        "4math4yl2xFNaNbNfeeZe",
-        "4math5ldexpFNaNbNfeiZe",
-        "4math6rndtolFNaNbNfeZl",
-        "4math6yl2xp1FNaNbNfeeZe",
-
-kk
-k
-k
+mm
+m
+m
-        "9intrinsic3btcFNbPmmZi",
-        "9intrinsic3btrFNbPmmZi",
-        "9intrinsic3btsFNbPmmZi",
-        "9intrinsic3inpFNbkZh",
-        "9intrinsic4inplFNbkZk",
-        "9intrinsic4inpwFNbkZt",
-        "9intrinsic4outpFNbkhZh",
-        "9intrinsic5bswapFNaNbkZk",
-        "9intrinsic5outplFNbkkZk",
-        "9intrinsic5outpwFNbktZt",
-#endif
-    };
-    static unsigned char ioptab[] =
-    {
-        OPcos,
-        OPsin,
-        OPabs,
-        OPrint,
-        OPsqrt,
-        OPsqrt,