Changeset 9:dafae18f9c08

Timestamp:

10/01/07 15:19:53 (1 year ago)

Author:

lindquist

branch:

trunk

Message:

[svn r13] * Updated for LLVM 2.1
* Class v-tables are now typesafe
* Code cleanups

Files:

• dmd/declaration.h (modified) (1 diff)
• dmd/mars.c (modified) (1 diff)
• dmd/mtype.c (modified) (1 diff)
• dmd/mtype.h (modified) (1 diff)
• gen/toir.c (modified) (1 diff)
• gen/tollvm.c (modified) (4 diffs)
• gen/tollvm.h (modified) (1 diff)
• gen/toobj.c (modified) (9 diffs)
• lib/llvmdcore.bc (modified) (previous)
• lphobos/build.sh (modified) (2 diffs)
• test/classes6.d (added)
• test/funcs2.d (added)

dmd/declaration.h

@@ -127 +127 @@
-
-    virtual void toObjFile();           // compile to .obj file
-
-    // llvm stuff
-    llvm::Value* llvmValue;
-};
-

dmd/mars.c

@@ -159 +159 @@
-    global.llvmdc_version, global.version, global.copyright, global.written);
-    printf("\
-
+
+
-Usage:\n\
-  dmd files.d ... { -switch }\n\

dmd/mtype.c

@@ -2542 +2542 @@
-    this->inuse = 0;
-    this->llvmRetInPtr = false;
+    this->llvmUsesThis = false;
-    this->llvmRetArg = 0;
-    this->llvmAllocaPoint = 0;

dmd/mtype.h

@@ -434 +434 @@
-
-    bool llvmRetInPtr;
+    bool llvmUsesThis;
-    llvm::Value* llvmRetArg;
-    llvm::Instruction* llvmAllocaPoint;

gen/toir.c

@@ -1247 +1247 @@
-            assert(e1->type->ty == Tclass);
-
-            const llvm::Type* vtbltype = llvm::PointerType::get(llvm::ArrayType::get(llvm::PointerType::get(llvm::Type::Int8Ty),0));
-
-            llvm::Value* zero = llvm::ConstantInt::get(llvm::Type::Int32Ty, 0, false);
-            llvm::Value* vtblidx = llvm::ConstantInt::get(llvm::Type::Int32Ty, (size_t)fdecl->vtblIndex, false);
-            funcval = LLVM_DtoGEP(e->arg, zero, zero, "tmp", p->scopebb());
-            funcval = new llvm::LoadInst(funcval,"tmp",p->scopebb());
-            funcval = new llvm::BitCastInst(funcval, vtbltype, "tmp", p->scopebb());
-            funcval = LLVM_DtoGEP(funcval, zero, vtblidx, "tmp", p->scopebb());
-            funcval = new llvm::LoadInst(funcval,"tmp",p->scopebb());
-
+
+
-        }
-        e->val = funcval;

gen/tollvm.c

@@ -209 +209 @@
-    assert(f != 0);
-
-has already been pulled in by a reference to (
+type has already been resolved
-    if (f->llvmType != 0) {
-        return llvm::cast<llvm::FunctionType>(f->llvmType);
@@ -248 +248 @@
-    }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -296 +303 @@
-
-    f->llvmType = functype;
+    f->llvmRetInPtr = retinptr;
+    f->llvmUsesThis = usesthis;
-    return functype;
-}
@@ -838 +847 @@
-    return new llvm::GetElementPtrInst(ptr, dst.begin(), dst.end(), var, bb);
-}
+
+llvm::Function* LLVM_DtoDeclareFunction(FuncDeclaration* fdecl)
+{
+    if (fdecl->llvmValue != 0) {
+        return llvm::cast<llvm::Function>(fdecl->llvmValue);
+    }
+
+    static int fdi = 0;
+    Logger::print("FuncDeclaration::toObjFile(%d,%s): %s\n", fdi++, fdecl->needThis()?"this":"static",fdecl->toChars());
+    LOG_SCOPE;
+
+    if (fdecl->llvmInternal == LLVMintrinsic && fdecl->fbody) {
+        error("intrinsics cannot have function bodies");
+        fatal();
+    }
+
+    // construct function
+    TypeFunction* f = (TypeFunction*)fdecl->type;
+    assert(f != 0);
+    llvm::FunctionType* functype = (f->llvmType == 0) ? LLVM_DtoFunctionType(fdecl) : llvm::cast<llvm::FunctionType>(f->llvmType);
+
+    // mangled name
+    char* mangled_name = (fdecl->llvmInternal == LLVMintrinsic) ? fdecl->llvmInternal1 : fdecl->mangle();
+
+    // make the function
+    llvm::Function* func = gIR->module->getFunction(mangled_name);
+    if (func == 0) {
+        func = new llvm::Function(functype,LLVM_DtoLinkage(fdecl->protection, fdecl->storage_class),mangled_name,gIR->module);
+    }
+
+    if (fdecl->llvmInternal != LLVMintrinsic)
+        func->setCallingConv(LLVM_DtoCallingConv(f->linkage));
+
+    fdecl->llvmValue = func;
+    f->llvmType = functype;
+
+    if (fdecl->isMain()) {
+        gIR->mainFunc = func;
+    }
+
+    // name parameters
+    llvm::Function::arg_iterator iarg = func->arg_begin();
+    int k = 0;
+    if (f->llvmRetInPtr) {
+        iarg->setName("retval");
+        f->llvmRetArg = iarg;
+        ++iarg;
+    }
+    if (f->llvmUsesThis) {
+        iarg->setName("this");
+        ++iarg;
+    }
+    for (; iarg != func->arg_end(); ++iarg)
+    {
+        Argument* arg = Argument::getNth(f->parameters, k++);
+        assert(arg != 0);
+        //arg->llvmValue = iarg;
+        //printf("identifier: '%s' %p\n", arg->ident->toChars(), arg->ident);
+        if (arg->ident != 0) {
+            if (arg->vardecl) {
+                arg->vardecl->llvmValue = iarg;
+            }
+            iarg->setName(arg->ident->toChars());
+        }
+        else {
+            iarg->setName("unnamed");
+        }
+    }
+
+    return func;
+}

gen/tollvm.h

@@ -12 +12 @@
-llvm::FunctionType* LLVM_DtoFunctionType(Type* t, const llvm::Type* thisparam = 0);
-llvm::FunctionType* LLVM_DtoFunctionType(FuncDeclaration* fdecl);
+llvm::Function* LLVM_DtoDeclareFunction(FuncDeclaration* fdecl);
-
-llvm::StructType* LLVM_DtoDelegateType(Type* t);

gen/toobj.c

@@ -337 +337 @@
-
-    // add vtable
-
+
+
-    gIR->topstruct().fields.push_back(vtabty);
-    gIR->topstruct().inits.push_back(0);
@@ -362 +363 @@
-    llvmType = structtype;
-
-    bool emit_vtable = false;
-    bool define_vtable = false;
-    if (parent->isModule()) {
-        gIR->module->addTypeName(mangle(),ts->llvmType);
-        emit_vtable = true;
-        define_vtable = (getModule() == gIR->dmodule);
-    }
@@ -373 +372 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    gIR->queueClassMethods.back() = false;
-    IRState::FuncDeclVec& mfs = gIR->classmethods.back();
@@ -379 +461 @@
-    for (size_t i=0; i<n; ++i) {
-        mfs[i]->toObjFile();
-    }
-
-    // create vtable initializer
-    if (emit_vtable)
-    {
-        llvm::GlobalVariable* vtblVar = 0;
-        std::vector<llvm::Constant*> inits;
-        inits.reserve(vtbl.dim);
-        for (int k=0; k < vtbl.dim; k++)
-        {
-            Dsymbol* dsym = (Dsymbol*)vtbl.data[k];
-            assert(dsym);
-            //Logger::cout() << "vtblsym: " << dsym->toChars() << '\n';
-
-            if (FuncDeclaration* fd = dsym->isFuncDeclaration()) {
-                fd->toObjFile();
-                Logger::cout() << "casting to constant" << *fd->llvmValue << '\n';
-                llvm::Constant* c = llvm::cast<llvm::Constant>(fd->llvmValue);
-                c = llvm::ConstantExpr::getBitCast(c, llvm::PointerType::get(llvm::Type::Int8Ty));
-                inits.push_back(c);
-            }
-            else if (ClassDeclaration* cd = dsym->isClassDeclaration()) {
-                llvm::Constant* c = llvm::Constant::getNullValue(llvm::PointerType::get(llvm::Type::Int8Ty));
-                inits.push_back(c);
-            }
-            else
-            assert(0);
-        }
-        if (!inits.empty())
-        {
-            llvm::GlobalValue::LinkageTypes _linkage = llvm::GlobalValue::ExternalLinkage;
-            std::string varname(mangle());
-            varname.append("__vtblZ");
-            const llvm::ArrayType* vtbl_ty = llvm::ArrayType::get(llvm::PointerType::get(llvm::Type::Int8Ty), inits.size());
-            vtblVar = new llvm::GlobalVariable(vtbl_ty, true, _linkage, 0, varname, gIR->module);
-            if (define_vtable) {
-                //Logger::cout() << "vtbl:::" << '\n' << *vtbl_st << '\n';// << " == | == " << _init << '\n';
-                llvm::Constant* _init = llvm::ConstantArray::get(vtbl_ty, inits);
-                vtblVar->setInitializer(_init);
-            }
-            llvmVtbl = vtblVar;
-        }
-
-        ////////////////////////////////////////////////////////////////////////////////
-
-        // generate initializer
-        llvm::GlobalValue::LinkageTypes _linkage = llvm::GlobalValue::ExternalLinkage;
-        llvm::Constant* _init = 0;
-
-        // first field is always the vtable
-        assert(vtblVar != 0);
-        llvm::Constant* vtbl_init_var = llvm::ConstantExpr::getBitCast(vtblVar, llvm::PointerType::get(llvm::Type::Int8Ty));
-        gIR->topstruct().inits[0] = vtbl_init_var;
-
-        //assert(tk == gIR->topstruct().size());
-        #ifndef LLVMD_NO_LOGGER
-        Logger::cout() << *structtype << '\n';
-        for (size_t k=0; k<gIR->topstruct().inits.size(); ++k)
-            Logger::cout() << *gIR->topstruct().inits[k] << '\n';
-        #endif
-        _init = llvm::ConstantStruct::get(structtype,gIR->topstruct().inits);
-        assert(_init);
-        std::string initname(mangle());
-        initname.append("__initZ");
-        Logger::cout() << *_init << '\n';
-        llvm::GlobalVariable* initvar = new llvm::GlobalVariable(ts->llvmType, true, _linkage, 0, initname, gIR->module);
-        ts->llvmInit = initvar;
-        if (define_vtable) {
-            initvar->setInitializer(_init);
-        }
-    }
-
@@ -561 +573 @@
-                const llvm::StructType* structty = llvm::cast<llvm::StructType>(_type);
-                TypeStruct* ts = (TypeStruct*)type;
+                assert(ts);
+                assert(ts->sym);
-                assert(ts->sym->llvmInitZ);
-                _init = ts->sym->llvmInitZ;
@@ -595 +609 @@
-void FuncDeclaration::toObjFile()
-{
-
+
+
-        return;
-    }
-
-
+
+
-    if (!gIR->queueClassMethods.empty() && gIR->queueClassMethods.back()) {
-        Logger::println("queueing %s", toChars());
@@ -607 +623 @@
-    }
-
-
-
-
-
-
-
-
-
+
+
-
-    TypeFunction* f = (TypeFunction*)type;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    // only members of the current module maybe be defined
@@ -797 +664 @@
-        if (allow_fbody && fbody != 0)
-        {
-
+
+
+
-            gIR->funcs.push(func);
-            gIR->functypes.push(f);
@@ -833 +702 @@
-
-            // get rid of the endentry block, it's never used
+            assert(!func->getBasicBlockList().empty());
-            func->getBasicBlockList().pop_back();
-
-            // if the last block is empty now, it must be unreachable or it's a bug somewhere else
+            // would be nice to figure out how to assert that this is correct
-            llvm::BasicBlock* lastbb = &func->getBasicBlockList().back();
-            if (lastbb->empty()) {
+                // possibly assert(lastbb->getNumPredecessors() == 0); ??? try it out sometime ...
-                new llvm::UnreachableInst(lastbb);
-            }
-        }
-    }
-
-
-
+
-    }
-

lphobos/build.sh

@@ -2 +2 @@
-
-if [ "$1" = "gdb" ]; then
-md
+c
-else
-dc_cmd="llvmdc"
@@ -12 +12 @@
-        -c -noruntime -odobj || exit 1
-
+llvm-as -f -o=obj/moduleinit_backend.bc internal/moduleinit_backend.ll || exit 1
+llvm-link -f -o=../lib/llvmdcore.bc obj/contract.bc obj/arrays.bc obj/moduleinit.bc obj/moduleinit_backend.bc || exit 1
+
-$dc_cmd internal/objectimpl.d -c -odobj || exit 1
-
-
-
-
+
-
-opt -f -std-compile-opts -o=../lib/llvmdcore.bc obj/all.bc || exit 1