Changeset 1149:5ebe8224988b

Timestamp:

03/27/09 18:17:04 (3 years ago)

Author:

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

branch:

default

Message:

Fixed problems introduced by previous commits that prevented Tango from compiling.

Files:

• gen/classes.cpp (modified) (5 diffs)
• gen/declarations.cpp (modified) (2 diffs)
• gen/functions.cpp (modified) (1 diff)
• gen/main.cpp (modified) (2 diffs)
• gen/structs.cpp (modified) (3 diffs)
• gen/tocall.cpp (modified) (1 diff)
• gen/toir.cpp (modified) (1 diff)
• ir/irstruct.h (modified) (1 diff)

gen/classes.cpp

@@ -146 +146 @@
-    cd->ir.irStruct = irstruct;
-
+    // create the type
+    const LLType* t = LLArrayType::get(getVoidPtrType(), cd->vtbl.dim);
+    assert(!ts->ir.type);
+    ts->ir.type = new LLPATypeHolder(getPtrToType(t));
+
+    // ... and ClassInfo
+    std::string varname("_D");
+    varname.append(cd->mangle());
+    varname.append("11__InterfaceZ");
+
+    // create global
+    irstruct->classInfo = new llvm::GlobalVariable(irstruct->classInfoOpaque.get(), false, DtoLinkage(cd), NULL, varname, gIR->module);
+
-    // handle base interfaces
-    if (cd->baseclasses.dim)
@@ -168 +181 @@
-        }
-    }
-
-    // create the type
-    const LLType* t = LLArrayType::get(getVoidPtrType(), cd->vtbl.dim);
-    assert(!ts->ir.type);
-    ts->ir.type = new LLPATypeHolder(getPtrToType(t));
-
-    // request declaration
@@ -239 +247 @@
-
-    // ... and initZ
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // push state
@@ -778 +794 @@
-    // refine __initZ global type to the one of the initializer
-    llvm::cast<llvm::OpaqueType>(irstruct->initOpaque.get())->refineAbstractTypeTo(irstruct->constInit->getType());
+
+    // build initializers for static member variables
+    size_t n = irstruct->staticVars.size();
+    for (size_t i = 0; i < n; ++i)
+    {
+        DtoConstInitGlobal(irstruct->staticVars[i]);
+    }
+    // This is all we use it for. Clear the memory!
+    irstruct->staticVars.clear();
-
-//     if (Logger::enabled())
@@ -1334 +1359 @@
-    ClassDeclaration* cinfo = ClassDeclaration::classinfo;
-    DtoResolveClass(cinfo);
-
-    // do the mangle
-    std::string gname("_D");
-    gname.append(cd->mangle());
-    if (!cd->isInterfaceDeclaration())
-        gname.append("7__ClassZ");
-    else
-        gname.append("11__InterfaceZ");
-
-    // create global
-    irstruct->classInfo = new llvm::GlobalVariable(irstruct->classInfoOpaque.get(), false, DtoLinkage(cd), NULL, gname, gIR->module);
-}
-

gen/declarations.cpp

@@ -84 +84 @@
-        return;
-    }
+
+    if (AggregateDeclaration* ad = isMember())
+        ad->codegen(p);
-
-    // global variable or magic
@@ -136 +139 @@
-            gIR->usedArray.push_back(DtoBitCast(gvar, getVoidPtrType()));
-
-
+
+
+
+
+
+
-    }
-    else

gen/functions.cpp

@@ -302 +302 @@
-        Logger::println("Ignoring unittest %s", fdecl->toPrettyChars());
-        return; // ignore declaration completely
-    }
-
-    // is imported and we don't have access?
-    if (fdecl->getModule() != gIR->dmodule)
-    {
-        if (fdecl->prot() == PROTprivate)
-        {
-            Logger::println("Ignoring private imported function %s", fdecl->toPrettyChars());
-            return;
-        }
-    }
-

gen/main.cpp

@@ -5 +5 @@
-
-#include "gen/llvm.h"
+#include "llvm/LinkAllVMCore.h"
-#include "llvm/Linker.h"
+#include "llvm/System/Signals.h"
-#include "llvm/Target/SubtargetFeature.h"
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetMachineRegistry.h"
-#include "llvm/LinkAllVMCore.h"
-
-#include <stdio.h>
@@ -118 +119 @@
-int main(int argc, char** argv)
-{
+    // stack trace on signals
+    llvm::sys::PrintStackTraceOnErrorSignal();
+
-    Array files;
-    char *p, *ext;

gen/structs.cpp

@@ -98 +98 @@
-
-    // force constant initialization of the symbol
-
-
-
-
-
-
-
-
-
-
+
-
-    // sanity check
@@ -242 +233 @@
-
-    // there might still be padding after the last one, make sure that is defaulted/zeroed as well
-getTypePaddedSize(structtype)
+si->ad->structsize
-
-    // if there is space before the next explicit initializer
@@ -646 +637 @@
-    llvm::cast<llvm::OpaqueType>(irstruct->initOpaque.get())->refineAbstractTypeTo(irstruct->constInit->getType());
-
+    // build initializers for static member variables
+    size_t n = irstruct->staticVars.size();
+    for (size_t i = 0; i < n; ++i)
+    {
+        DtoConstInitGlobal(irstruct->staticVars[i]);
+    }
+    // This is all we use it for. Clear the memory!
+    irstruct->staticVars.clear(); 
+
-    gIR->structs.pop_back();
-

gen/tocall.cpp

@@ -327 +327 @@
-                ctxarg = gIR->ir->CreateExtractValue(fnval->getRVal(), 0, ".ptr");
-            }
-assert(ctxarg->getType() ==
+ctxarg = DtoBitCast(ctxarg,
-            ++argiter;
-            args.push_back(ctxarg);

gen/toir.cpp

@@ -970 +970 @@
-        if (VarDeclaration* vd = vexp->var->isVarDeclaration())
-        {
+            vd->codegen(Type::sir);
-            LLConstant* llc = llvm::dyn_cast<LLConstant>(vd->ir.getIrValue());
-            assert(llc);

ir/irstruct.h

@@ -151 +151 @@
-    // composite type debug description
-    llvm::DICompositeType diCompositeType;
+
+    std::vector<VarDeclaration*> staticVars;
-};
-