Changeset 811:8e6135be6999

Timestamp:

11/30/08 20:10:16 (1 month ago)

Author:

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

branch:

default

Message:

Fixed ModuleInfo? generation to no longer use the ModuleInfo? class' default initializer for types/defaults, it's unsafe as initializers don't necesarily match the "formal" type. There might be explicit padding.
Changed -g switch to emit DW_LANG_D debug info, make demangling work with a patched GDB, still more work to do for full support of D's Dwarf extensions.
Added getNullValue helper method.

Files:

• dmd/mars.c (modified) (1 diff)
• dmd2/mars.c (modified) (1 diff)
• gen/todebug.cpp (modified) (1 diff)
• gen/tollvm.cpp (modified) (1 diff)
• gen/tollvm.h (modified) (1 diff)
• gen/toobj.cpp (modified) (7 diffs)

dmd/mars.c

@@ -375 +375 @@
-        else if (strcmp(p + 1, "fPIC") == 0)
-        global.params.pic = 1;
- || strcmp(p + 1, "gc") == 0
+
-        global.params.symdebug = 1;
+        else if (strcmp(p + 1, "gc") == 0)
+        global.params.symdebug = 2;
-        else if (strcmp(p + 1, "v") == 0)
-        global.params.verbose = 1;

dmd2/mars.c

@@ -392 +392 @@
-        else if (strcmp(p + 1, "fPIC") == 0)
-        global.params.pic = 1;
- || strcmp(p + 1, "gc") == 0
+
-        global.params.symdebug = 1;
+        else if (strcmp(p + 1, "gc") == 0)
+        global.params.symdebug = 2;
-        else if (strcmp(p + 1, "v") == 0)
-        global.params.verbose = 1;

gen/todebug.cpp

@@ -135 +135 @@
-    vals[1] = DBG_CAST(getDwarfAnchor(DW_TAG_compile_unit));
-
-
+
+
+
+
-    vals[3] = DtoConstStringPtr(FileName::name(m->srcfile->name->toChars()), "llvm.metadata");
-    std::string srcpath(FileName::path(m->srcfile->name->toChars()));

gen/tollvm.cpp

@@ -674 +674 @@
-}
-
+LLConstant* getNullValue(const LLType* t)
+{
+    return LLConstant::getNullValue(t);
+}
+
-//////////////////////////////////////////////////////////////////////////////////////////
-

gen/tollvm.h

@@ -88 +88 @@
-const LLPointerType* getVoidPtrType();
-llvm::ConstantPointerNull* getNullPtr(const LLType* t);
+LLConstant* getNullValue(const LLType* t);
-
-// type sizes

gen/toobj.cpp

@@ -680 +680 @@
-void Module::genmoduleinfo()
-{
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // resolve ModuleInfo
@@ -706 +708 @@
-    // moduleinfo llvm struct type
-    const llvm::StructType* moduleinfoTy = isaStruct(moduleinfo->type->ir.type->get());
-
-    // classinfo llvm struct type
-    const llvm::StructType* classinfoTy = isaStruct(ClassDeclaration::classinfo->type->ir.type->get());
@@ -734 +735 @@
-        Module *m = (Module *)aimports.data[i];
-        if (!m->needModuleInfo())
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-    // has import array?
@@ -759 +759 @@
-    }
-    else
-moduleinfo->ir.irStruct->constInit->getOperand(3
+DtoConstSlice( DtoConstSize_t(0), getNullValue(getPtrToType(moduleinfoTy)) 
-    initVec.push_back(c);
-
@@ -790 +790 @@
-        Logger::println("class: %s", cd->toPrettyChars());
-        assert(cd->ir.irStruct->classInfo);
-llvm::ConstantExpr::get
+Dto
-        classInits.push_back(c);
-    }
@@ -803 +803 @@
-        assert(gIR->module->getGlobalVariable(m_name) == NULL);
-        llvm::GlobalVariable* m_gvar = new llvm::GlobalVariable(classArrTy, true, llvm::GlobalValue::InternalLinkage, c, m_name, gIR->module);
-llvm::ConstantExpr::getBitCast(m_gvar, getPtrToType(classArrTy->getElementType()
+DtoBitCast(m_gvar, getPtrToType(classinfoTy
-        c = DtoConstSlice(DtoConstSize_t(classInits.size()), c);
-    }
-    else
-moduleinfo->ir.irStruct->constInit->getOperand(4
+DtoConstSlice( DtoConstSize_t(0), getNullValue(getPtrToType(classinfoTy)) 
-    initVec.push_back(c);
-
@@ -816 +816 @@
-    initVec.push_back(c);
-
+    // function pointer type for next three fields
+    const LLType* fnptrTy = getPtrToType(LLFunctionType::get(LLType::VoidTy, std::vector<const LLType*>(), false));
+
-    // ctor
-    llvm::Function* fctor = build_module_ctor();
-moduleinfo->ir.irStruct->constInit->getOperand(6
+getNullValue(fnptrTy
-    initVec.push_back(c);
-
-    // dtor
-    llvm::Function* fdtor = build_module_dtor();
-moduleinfo->ir.irStruct->constInit->getOperand(7
+getNullValue(fnptrTy
-    initVec.push_back(c);
-
-    // unitTest
-    llvm::Function* unittest = build_module_unittest();
-moduleinfo->ir.irStruct->constInit->getOperand(8
+getNullValue(fnptrTy
-    initVec.push_back(c);
-
-    // xgetMembers
-moduleinfo->ir.irStruct->constInit->getOperand(9
+getNullValue(getVoidPtrType()
-    initVec.push_back(c);
-
-    // ictor
-moduleinfo->ir.irStruct->constInit->getOperand(10
+getNullValue(fnptrTy
-    initVec.push_back(c);
-