Changeset 715:30b42a283c8e

Timestamp:

10/22/08 08:55:33 (3 months ago)

Author:

Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>

branch:

default

Message:

Removed TypeOpaque? from DMD.
Changed runtime functions taking opaque[] to void[].
Implemented proper type painting, to avoid "resizing" array casts in runtime calls that previously took opaque[].
Implemented dynamic arrays as first class types, this implements proper ABI for these types on x86.
Added dwarf region end after call to assert function, fixes some problems with llvm not allowing this to be missing.
Reverted change to WithStatement? from rev [704] it breaks MiniD, mini/with2.d needs to be fixed some other way...
Fixed tango bug 1339 in runtime, problem with _adReverseChar on invalid UTF-8.
Disabled .bc generation in the compiler runtime part, genobj.d triggers some llvm bug when using debug info. the .o seems to work fine.

Files:

• dmd/impcnvtab.c (modified) (1 diff)
• dmd/mtype.c (modified) (12 diffs)
• dmd/mtype.h (modified) (3 diffs)
• dmd/statement.c (modified) (4 diffs)
• gen/arrays.cpp (modified) (8 diffs)
• gen/dvalue.cpp (modified) (1 diff)
• gen/dvalue.h (modified) (3 diffs)
• gen/functions.cpp (modified) (5 diffs)
• gen/llvmhelpers.cpp (modified) (6 diffs)
• gen/llvmhelpers.h (modified) (1 diff)
• gen/runtime.cpp (modified) (17 diffs)
• gen/statements.cpp (modified) (7 diffs)
• gen/tocall.cpp (modified) (3 diffs)
• gen/toir.cpp (modified) (3 diffs)
• gen/tollvm.cpp (modified) (7 diffs)
• gen/tollvm.h (modified) (1 diff)
• gen/toobj.cpp (modified) (1 diff)
• runtime/internal/aApply.d (modified) (3 diffs)
• runtime/internal/aaA.d (modified) (7 diffs)
• runtime/internal/adi.d (modified) (7 diffs)
• runtime/internal/ldc.mak (modified) (3 diffs)
• runtime/internal/lifetime.d (modified) (3 diffs)
• runtime/internal/qsort2.d (modified) (2 diffs)
• tests/mini/foreach6.d (modified) (1 diff)
• tests/mini/foreach8.d (modified) (2 diffs)

dmd/impcnvtab.c

@@ -3 +3 @@
-unsigned char Type::impcnvResult[TMAX][TMAX] =
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-unsigned char Type::impcnvType1[TMAX][TMAX] =
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-unsigned char Type::impcnvType2[TMAX][TMAX] =
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-unsigned char Type::impcnvWarn[TMAX][TMAX] =
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};

dmd/mtype.c

@@ -104 +104 @@
-ClassDeclaration *Type::typeinfotypelist;
-
-// LDC
-Type* Type::topaque;
-
-Type *Type::tvoidptr;
-Type *Type::basic[TMAX];
@@ -211 +208 @@
-    mangleChar[Tslice] = '@';
-
-    // LDC
-    mangleChar[Topaque] = 'O';
-
-    for (i = 0; i < TMAX; i++)
-    {   if (!mangleChar[i])
@@ -234 +228 @@
-
-    tvoidptr = tvoid->pointerTo();
-
-    // LDC
-    topaque = new TypeOpaque();
-
-    // set size_t / ptrdiff_t types and pointer size
@@ -1626 +1617 @@
-        Arguments* args = new Arguments;
-        args->push(new Argument(STCin, Type::typeinfo->type, NULL, NULL));
-opaque
-opaque
+void
+void
-    }
-    static FuncDeclaration *adReverse_fd = NULL;
-    if(!adReverse_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-opaque
+void
-    }
-
@@ -1645 +1636 @@
-    if (dup)
-        arguments->push(getTypeInfo(sc));
-
+
+
+
+
+
+
+
+
-    if (!dup)
-        arguments->push(new IntegerExp(0, size, Type::tint32));
@@ -1661 +1659 @@
-    if(!adSort_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        args->push(new Argument(STCin, Type::typeinfo->type, NULL, NULL));
-opaque
+void
-    }
-    static FuncDeclaration *adSortBit_fd = NULL;
-    if(!adSortBit_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        args->push(new Argument(STCin, Type::typeinfo->type, NULL, NULL));
-opaque
+void
-    }
-
@@ -1679 +1677 @@
-    e = e->castTo(sc, n->arrayOf());    // convert to dynamic array
-    arguments = new Expressions();
-
+
+
+
+
+
+
+
+
-    if (next->ty != Tbit)
-        arguments->push(n->getTypeInfo(sc));   // LDC, we don't support the getInternalTypeInfo
@@ -2351 +2356 @@
-    if(!aaLen_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        aaLen_fd = FuncDeclaration::genCfunc(args, Type::tsize_t, Id::aaLen);
-    }
@@ -2372 +2377 @@
-    if(!aaKeys_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-opaque
+void
-    }
-
@@ -2393 +2398 @@
-    if(!aaValues_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-        args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-opaque
+void
-    }
-
@@ -2418 +2423 @@
-    if(!aaRehash_fd) {
-        Arguments* args = new Arguments;
-opaque
+void
-        args->push(new Argument(STCin, Type::typeinfo->type, NULL, NULL));
-        aaRehash_fd = FuncDeclaration::genCfunc(args, Type::tvoidptr, Id::aaRehash);
@@ -5243 +5248 @@
-}
-
-void TypeOpaque::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
-{
-    //printf("TypeOpaquePtr::toCBuffer2()");
-    if (mod != this->mod)
-    {   toCBuffer3(buf, hgs, mod);
-    return;
-    }
-   buf->writestring("opaque");
-}
-
-/***************************** Argument *****************************/
-

dmd/mtype.h

@@ -99 +99 @@
-    Tslice,
-
-// LDC
-    Topaque,
-
-    TMAX
-};
@@ -177 +174 @@
-    static ClassDeclaration *typeinfodelegate;
-    static ClassDeclaration *typeinfotypelist;
-
-    // LDC, for runtime function signatures that contain
-    // AAs or arrays of unknown type
-    static Type* topaque;
-
-    static Type *basic[TMAX];
@@ -675 +668 @@
-};
-
-//LDC
-struct TypeOpaque : Type
-{ 
-    TypeOpaque() : Type(Topaque, NULL) {}
-    void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
-};
-
-/**************************************************************/
-

dmd/statement.c

@@ -1603 +1603 @@
-        if(!aaApply2_fd) {
-            Arguments* args = new Arguments;
-opaque
+void
-            args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-            Arguments* dgargs = new Arguments;
@@ -1615 +1615 @@
-        if(!aaApply_fd) {
-            Arguments* args = new Arguments;
-opaque
+void
-            args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-            Arguments* dgargs = new Arguments;
@@ -1670 +1670 @@
-        //LDC: Build arguments.
-        Arguments* args = new Arguments;
-Type::topaque
+tn
-        if (dim == 2) {
-            Arguments* dgargs = new Arguments;
@@ -1690 +1690 @@
-        if (tab->ty == Tsarray)
-           aggr = aggr->castTo(sc, tn->arrayOf());
-       
+        
-        exps->push(flde);
-        e = new CallExp(loc, ec, exps);

gen/arrays.cpp

@@ -56 +56 @@
-    LOG_SCOPE;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -685 +639 @@
-    assert(fn);
-
+    // find common dynamic array type
+    Type* commonType = l->getType()->toBasetype()->nextOf()->arrayOf();
+
+    // cast static arrays to dynamic ones, this turns them into DSliceValues
+    Logger::println("casting to dynamic arrays");
+    l = DtoCastArray(loc, l, commonType);
+    r = DtoCastArray(loc, r, commonType);
+
-    LLValue* lmem;
-    LLValue* rmem;
-
-    // cast static arrays to dynamic ones, this turns them into DSliceValues
-    Logger::println("casting to dynamic arrays");
-    Type* l_ty = l->getType()->toBasetype();
-    Type* r_ty = r->getType()->toBasetype();
-    assert(l_ty->next == r_ty->next);
-    if ((l_ty->ty == Tsarray) || (r_ty->ty == Tsarray)) {
-        Type* a_ty = l_ty->next->arrayOf();
-        if (l_ty->ty == Tsarray)
-            l = DtoCastArray(loc, l, a_ty);
-        if (r_ty->ty == Tsarray)
-            r = DtoCastArray(loc, r, a_ty);
-    }
-
-    Logger::println("giving storage");
-
-    // we need to give slices storage
-    if (l->isSlice()) {
-        lmem = DtoAlloca(DtoType(l->getType()), "tmpparam");
-        DtoSetArray(lmem, DtoArrayLen(l), DtoArrayPtr(l));
-    }
-    // also null
-    else if (l->isNull())
-    {
-        lmem = DtoAlloca(DtoType(l->getType()), "tmpparam");
-        DtoSetArray(lmem, llvm::Constant::getNullValue(DtoSize_t()), llvm::Constant::getNullValue(DtoType(l->getType()->next->pointerTo())));
-    }
-    else
-        lmem = l->getRVal();
-
-    // and for the rvalue ...
-    // we need to give slices storage
-    if (r->isSlice()) {
-        rmem = DtoAlloca(DtoType(r->getType()), "tmpparam");
-        DtoSetArray(rmem, DtoArrayLen(r), DtoArrayPtr(r));
-    }
-    // also null
-    else if (r->isNull())
-    {
-        rmem = DtoAlloca(DtoType(r->getType()), "tmpparam");
-        DtoSetArray(rmem, llvm::Constant::getNullValue(DtoSize_t()), llvm::Constant::getNullValue(DtoType(r->getType()->next->pointerTo())));
-    }
-    else
-        rmem = r->getRVal();
-
-    const LLType* pt = fn->getFunctionType()->getParamType(0);
-
-    LLSmallVector<LLValue*, 3> args;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    // pass array typeinfo ?
@@ -754 +668 @@
-            Logger::cout() << "typeinfo decl: " << *tival << '\n';
-
-
-
+
-    }
-
-    CallOrInvoke* call = gIR->CreateCallOrInvoke(fn, args.begin(), args.end(), "tmp");
-
-    // set param attrs
-    llvm::AttrListPtr palist;
-    palist = palist.addAttr(1, llvm::Attribute::ByVal);
-    palist = palist.addAttr(2, llvm::Attribute::ByVal);
-    call->setAttributes(palist);
-
-    return call->get();
@@ -918 +825 @@
-        else if (v->isNull())
-            return DtoConstSize_t(0);
-
+
+
+
-    }
-    else if (t->ty == Tsarray) {
@@ -944 +853 @@
-        else if (v->isNull())
-            return getNullPtr(getPtrToType(DtoType(t->next)));
-
+
+
+
-    }
-    else if (t->ty == Tsarray) {
@@ -1047 +958 @@
-}
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-void DtoArrayBoundsCheck(Loc& loc, DValue* arr, DValue* index, bool isslice)
@@ -1072 +982 @@
-
-    std::vector<LLValue*> args;
-    llvm::AttrListPtr palist;
-
-    // file param
-
-
+
-
-    // line param
@@ -1085 +993 @@
-    llvm::Function* errorfn = LLVM_D_GetRuntimeFunction(gIR->module, "_d_array_bounds");
-    CallOrInvoke* call = gIR->CreateCallOrInvoke(errorfn, args.begin(), args.end());
-    call->setAttributes(palist);
-
-    // the function does not return
-    gIR->ir->CreateUnreachable();
-
-
-    // if ok, proceed in okbb
-    gIR->scope() = IRScope(okbb, oldend);

gen/dvalue.cpp

@@ -44 +44 @@
-/////////////////////////////////////////////////////////////////////////////////////////////////
-
+LLValue* DSliceValue::getRVal()
+{
+    assert(len);
+    assert(ptr);
+    return DtoAggrPair(len, ptr);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////////////////
+
-DFuncValue::DFuncValue(FuncDeclaration* fd, LLValue* v, LLValue* vt)
-{

gen/dvalue.h

@@ -30 +30 @@
-struct DFuncValue;
-struct DSliceValue;
-struct DArrayLenValue;
-struct DLRValue;
-
@@ -50 +49 @@
-    virtual DSliceValue* isSlice() { return NULL; }