annotate gen/functions.cpp @ 213:7816aafeea3c trunk

[svn r229] Updated the object.d implementation to the latest Tango. Fixed a bunch of the built-in typeinfos for arrays, they did not inherit TypeInfo_Array. Applied patch to tango/text/convert/Layout.d by fvbommel, closes #47 . Cleaned up some type code. Replaced uses of llvm::Type with LLType (a typedef), same for Value and Constant. Fixed a few cases where typeinfo for user structs could be emitted multiple times, seems to still be some cases of this :/
author lindquist
date Fri, 30 May 2008 19:32:04 +0200
parents 9d44ec83acd1
children a58d8f4b84df
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
1 #include "gen/llvm.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
2
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
3 #include "mtype.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
4 #include "aggregate.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
5 #include "init.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
6 #include "declaration.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
7 #include "template.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
8 #include "module.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
9 #include "statement.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
10
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
11 #include "gen/irstate.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
12 #include "gen/tollvm.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
13 #include "gen/runtime.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
14 #include "gen/arrays.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
15 #include "gen/logger.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
16 #include "gen/functions.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
17 #include "gen/todebug.h"
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
18 #include "gen/classes.h"
131
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
19 #include "gen/dvalue.h"
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
20
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
21 const llvm::FunctionType* DtoFunctionType(Type* type, const LLType* thistype, bool ismain)
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
22 {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
23 TypeFunction* f = (TypeFunction*)type;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
24 assert(f != 0);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
25
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
26 if (type->ir.type != NULL) {
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
27 return llvm::cast<llvm::FunctionType>(type->ir.type->get());
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
28 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
29
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
30 bool typesafeVararg = false;
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
31 bool arrayVararg = false;
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
32 if (f->linkage == LINKd)
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
33 {
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
34 if (f->varargs == 1)
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
35 typesafeVararg = true;
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
36 else if (f->varargs == 2)
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
37 arrayVararg = true;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
38 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
39
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
40 // return value type
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
41 const LLType* rettype;
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
42 const LLType* actualRettype;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
43 Type* rt = f->next;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
44 bool retinptr = false;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
45 bool usesthis = false;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
46
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
47 if (ismain) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
48 rettype = llvm::Type::Int32Ty;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
49 actualRettype = rettype;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
50 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
51 else {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
52 assert(rt);
109
5ab8e92611f9 [svn r113] Added initial support for associative arrays (AAs).
lindquist
parents: 108
diff changeset
53 Type* rtfin = DtoDType(rt);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
54 if (DtoIsPassedByRef(rt)) {
133
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
55 rettype = getPtrToType(DtoType(rt));
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
56 actualRettype = llvm::Type::VoidTy;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
57 f->llvmRetInPtr = retinptr = true;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
58 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
59 else {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
60 rettype = DtoType(rt);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
61 actualRettype = rettype;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
62 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
63 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
64
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
65 // parameter types
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
66 std::vector<const LLType*> paramvec;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
67
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
68 if (retinptr) {
123
7f9a0a58394b [svn r127] Updated the lphobos build scripts a little. Created a new rebuild profile.
lindquist
parents: 121
diff changeset
69 //Logger::cout() << "returning through pointer parameter: " << *rettype << '\n';
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
70 paramvec.push_back(rettype);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
71 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
72
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
73 if (thistype) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
74 paramvec.push_back(thistype);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
75 usesthis = true;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
76 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
77
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
78 if (typesafeVararg) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
79 ClassDeclaration* ti = Type::typeinfo;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
80 ti->toObjFile();
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
81 DtoForceConstInitDsymbol(ti);
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
82 assert(ti->ir.irStruct->constInit);
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
83 std::vector<const LLType*> types;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
84 types.push_back(DtoSize_t());
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
85 types.push_back(getPtrToType(getPtrToType(ti->ir.irStruct->constInit->getType())));
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
86 const LLType* t1 = llvm::StructType::get(types);
133
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
87 paramvec.push_back(getPtrToType(t1));
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
88 paramvec.push_back(getPtrToType(llvm::Type::Int8Ty));
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
89 }
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
90 else if (arrayVararg)
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
91 {
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
92 // do nothing?
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
93 }
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
94
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
95 size_t n = Argument::dim(f->parameters);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
96
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
97 for (int i=0; i < n; ++i) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
98 Argument* arg = Argument::getNth(f->parameters, i);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
99 // ensure scalar
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
100 Type* argT = DtoDType(arg->type);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
101 assert(argT);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
102
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
103 const LLType* at = DtoType(argT);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
104 if (isaStruct(at)) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
105 Logger::println("struct param");
133
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
106 paramvec.push_back(getPtrToType(at));
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
107 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
108 else if (isaArray(at)) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
109 Logger::println("sarray param");
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
110 assert(argT->ty == Tsarray);
133
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
111 //paramvec.push_back(getPtrToType(at->getContainedType(0)));
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
112 paramvec.push_back(getPtrToType(at));
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
113 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
114 else if (llvm::isa<llvm::OpaqueType>(at)) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
115 Logger::println("opaque param");
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
116 assert(argT->ty == Tstruct || argT->ty == Tclass);
133
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
117 paramvec.push_back(getPtrToType(at));
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
118 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
119 else {
131
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
120 if ((arg->storageClass & STCref) || (arg->storageClass & STCout)) {
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
121 Logger::println("by ref param");
133
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
122 at = getPtrToType(at);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
123 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
124 else {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
125 Logger::println("in param");
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
126 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
127 paramvec.push_back(at);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
128 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
129 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
130
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
131 // construct function type
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
132 bool isvararg = !(typesafeVararg || arrayVararg) && f->varargs;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
133 llvm::FunctionType* functype = llvm::FunctionType::get(actualRettype, paramvec, isvararg);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
134
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
135 f->llvmRetInPtr = retinptr;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
136 f->llvmUsesThis = usesthis;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
137
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
138 //if (!f->ir.type)
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
139 f->ir.type = new llvm::PATypeHolder(functype);
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
140 //else
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
141 //assert(functype == f->ir.type->get());
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
142
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
143 return functype;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
144 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
145
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
146 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
147
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
148 static const llvm::FunctionType* DtoVaFunctionType(FuncDeclaration* fdecl)
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
149 {
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
150 // type has already been resolved
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
151 if (fdecl->type->ir.type != 0) {
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
152 return llvm::cast<llvm::FunctionType>(fdecl->type->ir.type->get());
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
153 }
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
154
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
155 TypeFunction* f = (TypeFunction*)fdecl->type;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
156 assert(f != 0);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
157
133
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
158 const llvm::PointerType* i8pty = getPtrToType(llvm::Type::Int8Ty);
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
159 std::vector<const LLType*> args;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
160
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
161 if (fdecl->llvmInternal == LLVMva_start) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
162 args.push_back(i8pty);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
163 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
164 else if (fdecl->llvmInternal == LLVMva_intrinsic) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
165 size_t n = Argument::dim(f->parameters);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
166 for (size_t i=0; i<n; ++i) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
167 args.push_back(i8pty);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
168 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
169 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
170 else
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
171 assert(0);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
172
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
173 const llvm::FunctionType* fty = llvm::FunctionType::get(llvm::Type::VoidTy, args, false);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
174
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
175 f->ir.type = new llvm::PATypeHolder(fty);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
176
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
177 return fty;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
178 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
179
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
180 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
181
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
182 const llvm::FunctionType* DtoFunctionType(FuncDeclaration* fdecl)
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
183 {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
184 if ((fdecl->llvmInternal == LLVMva_start) || (fdecl->llvmInternal == LLVMva_intrinsic)) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
185 return DtoVaFunctionType(fdecl);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
186 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
187
121
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
188 // unittest has null type, just build it manually
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
189 /*if (fdecl->isUnitTestDeclaration()) {
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
190 std::vector<const LLType*> args;
121
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
191 return llvm::FunctionType::get(llvm::Type::VoidTy, args, false);
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
192 }*/
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
193
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
194 // type has already been resolved
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
195 if (fdecl->type->ir.type != 0) {
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
196 return llvm::cast<llvm::FunctionType>(fdecl->type->ir.type->get());
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
197 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
198
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
199 const LLType* thisty = NULL;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
200 if (fdecl->needThis()) {
132
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!!
lindquist
parents: 131
diff changeset
201 if (AggregateDeclaration* ad = fdecl->isMember2()) {
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!!
lindquist
parents: 131
diff changeset
202 Logger::println("isMember = this is: %s", ad->type->toChars());
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
203 thisty = DtoType(ad->type);
113
27b9f749d9fe [svn r117] Initial working implementation of interfaces.
lindquist
parents: 109
diff changeset
204 //Logger::cout() << "this llvm type: " << *thisty << '\n';
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
205 if (isaStruct(thisty) || (!gIR->structs.empty() && thisty == gIR->topstruct()->recty.get()))
133
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
206 thisty = getPtrToType(thisty);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
207 }
132
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!!
lindquist
parents: 131
diff changeset
208 else {
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!!
lindquist
parents: 131
diff changeset
209 Logger::println("chars: %s type: %s kind: %s", fdecl->toChars(), fdecl->type->toChars(), fdecl->kind());
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!!
lindquist
parents: 131
diff changeset
210 assert(0);
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!!
lindquist
parents: 131
diff changeset
211 }
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
212 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
213 else if (fdecl->isNested()) {
133
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
214 thisty = getPtrToType(llvm::Type::Int8Ty);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
215 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
216
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
217 const llvm::FunctionType* functype = DtoFunctionType(fdecl->type, thisty, fdecl->isMain());
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
218
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
219 return functype;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
220 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
221
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
222 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
223
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
224 static llvm::Function* DtoDeclareVaFunction(FuncDeclaration* fdecl)
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
225 {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
226 TypeFunction* f = (TypeFunction*)DtoDType(fdecl->type);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
227 const llvm::FunctionType* fty = DtoVaFunctionType(fdecl);
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
228 LLConstant* fn = 0;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
229
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
230 if (fdecl->llvmInternal == LLVMva_start) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
231 fn = gIR->module->getOrInsertFunction("llvm.va_start", fty);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
232 assert(fn);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
233 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
234 else if (fdecl->llvmInternal == LLVMva_intrinsic) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
235 fn = gIR->module->getOrInsertFunction(fdecl->llvmInternal1, fty);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
236 assert(fn);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
237 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
238 else
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
239 assert(0);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
240
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
241 llvm::Function* func = llvm::dyn_cast<llvm::Function>(fn);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
242 assert(func);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
243 assert(func->isIntrinsic());
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
244 fdecl->ir.irFunc->func = func;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
245 return func;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
246 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
247
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
248 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
249
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
250 void DtoResolveFunction(FuncDeclaration* fdecl)
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
251 {
121
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
252 if (!global.params.useUnitTests && fdecl->isUnitTestDeclaration()) {
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
253 return; // ignore declaration completely
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
254 }
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
255
133
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
256 // is imported and we don't have access?
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
257 if (fdecl->getModule() != gIR->dmodule)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
258 {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
259 if (fdecl->prot() == PROTprivate)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
260 return;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
261 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
262
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
263 if (fdecl->ir.resolved) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
264 fdecl->ir.resolved = true;
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
265
132
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!!
lindquist
parents: 131
diff changeset
266 Logger::println("DtoResolveFunction(%s): %s", fdecl->toPrettyChars(), fdecl->loc.toChars());
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
267 LOG_SCOPE;
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
268
136
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though
lindquist
parents: 133
diff changeset
269 if (fdecl->runTimeHack) {
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
270 gIR->declareList.push_back(fdecl);
127
facc562f5674 [svn r131] Fixed #11
lindquist
parents: 123
diff changeset
271 TypeFunction* tf = (TypeFunction*)fdecl->type;
facc562f5674 [svn r131] Fixed #11
lindquist
parents: 123
diff changeset
272 tf->llvmRetInPtr = DtoIsPassedByRef(tf->next);
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
273 return;
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
274 }
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
275
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
276 if (fdecl->parent)
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
277 if (TemplateInstance* tinst = fdecl->parent->isTemplateInstance())
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
278 {
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
279 TemplateDeclaration* tempdecl = tinst->tempdecl;
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
280 if (tempdecl->llvmInternal == LLVMva_arg)
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
281 {
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
282 Logger::println("magic va_arg found");
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
283 fdecl->llvmInternal = LLVMva_arg;
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
284 fdecl->ir.declared = true;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
285 fdecl->ir.initialized = true;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
286 fdecl->ir.defined = true;
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
287 return; // this gets mapped to an instruction so a declaration makes no sence
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
288 }
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
289 else if (tempdecl->llvmInternal == LLVMva_start)
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
290 {
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
291 Logger::println("magic va_start found");
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
292 fdecl->llvmInternal = LLVMva_start;
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
293 }
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
294 }
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
295
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
296 DtoFunctionType(fdecl);
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
297
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
298 // queue declaration
113
27b9f749d9fe [svn r117] Initial working implementation of interfaces.
lindquist
parents: 109
diff changeset
299 if (!fdecl->isAbstract())
27b9f749d9fe [svn r117] Initial working implementation of interfaces.
lindquist
parents: 109
diff changeset
300 gIR->declareList.push_back(fdecl);
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
301 }
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
302
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
303 //////////////////////////////////////////////////////////////////////////////////////////
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
304
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
305 void DtoDeclareFunction(FuncDeclaration* fdecl)
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
306 {
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
307 if (fdecl->ir.declared) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
308 fdecl->ir.declared = true;
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
309
132
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!!
lindquist
parents: 131
diff changeset
310 Logger::println("DtoDeclareFunction(%s): %s", fdecl->toPrettyChars(), fdecl->loc.toChars());
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
311 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
312
113
27b9f749d9fe [svn r117] Initial working implementation of interfaces.
lindquist
parents: 109
diff changeset
313 assert(!fdecl->isAbstract());
27b9f749d9fe [svn r117] Initial working implementation of interfaces.
lindquist
parents: 109
diff changeset
314
121
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
315 // intrinsic sanity check
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
316 if (fdecl->llvmInternal == LLVMintrinsic && fdecl->fbody) {
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
317 error(fdecl->loc, "intrinsics cannot have function bodies");
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
318 fatal();
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
319 }
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
320
136
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though
lindquist
parents: 133
diff changeset
321 if (fdecl->runTimeHack) {
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
322 Logger::println("runtime hack func chars: %s", fdecl->toChars());
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
323 if (!fdecl->ir.irFunc) {
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
324 fdecl->ir.irFunc = new IrFunction(fdecl);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
325 fdecl->ir.irFunc->func = LLVM_D_GetRuntimeFunction(gIR->module, fdecl->toChars());
136
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though
lindquist
parents: 133
diff changeset
326 }
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
327 return;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
328 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
329
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
330 bool declareOnly = false;
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
331 bool templInst = fdecl->parent && DtoIsTemplateInstance(fdecl->parent);
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
332 if (!templInst && fdecl->getModule() != gIR->dmodule)
144
a27941d00351 [svn r149] fixed: a bunch of D-style variadics problems.
lindquist
parents: 139
diff changeset
333 {
a27941d00351 [svn r149] fixed: a bunch of D-style variadics problems.
lindquist
parents: 139
diff changeset
334 Logger::println("not template instance, and not in this module. declare only!");
a27941d00351 [svn r149] fixed: a bunch of D-style variadics problems.
lindquist
parents: 139
diff changeset
335 Logger::println("current module: %s", gIR->dmodule->ident->toChars());
a27941d00351 [svn r149] fixed: a bunch of D-style variadics problems.
lindquist
parents: 139
diff changeset
336 Logger::println("func module: %s", fdecl->getModule()->ident->toChars());
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
337 declareOnly = true;
144
a27941d00351 [svn r149] fixed: a bunch of D-style variadics problems.
lindquist
parents: 139
diff changeset
338 }
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
339 else if (fdecl->llvmInternal == LLVMva_start)
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
340 declareOnly = true;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
341
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
342 if (!fdecl->ir.irFunc) {
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
343 fdecl->ir.irFunc = new IrFunction(fdecl);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
344 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
345
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
346 // mangled name
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
347 char* mangled_name;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
348 if (fdecl->llvmInternal == LLVMintrinsic)
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
349 mangled_name = fdecl->llvmInternal1;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
350 else
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
351 mangled_name = fdecl->mangle();
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
352
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
353 llvm::Function* vafunc = 0;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
354 if ((fdecl->llvmInternal == LLVMva_start) || (fdecl->llvmInternal == LLVMva_intrinsic)) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
355 vafunc = DtoDeclareVaFunction(fdecl);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
356 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
357
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
358 Type* t = DtoDType(fdecl->type);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
359 TypeFunction* f = (TypeFunction*)t;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
360
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
361 // construct function
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
362 const llvm::FunctionType* functype = DtoFunctionType(fdecl);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
363 llvm::Function* func = vafunc ? vafunc : gIR->module->getFunction(mangled_name);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
364 if (!func)
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
365 func = llvm::Function::Create(functype, DtoLinkage(fdecl), mangled_name, gIR->module);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
366 else
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
367 assert(func->getFunctionType() == functype);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
368
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
369 // add func to IRFunc
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
370 fdecl->ir.irFunc->func = func;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
371
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
372 // calling convention
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
373 if (!vafunc && fdecl->llvmInternal != LLVMintrinsic)
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
374 func->setCallingConv(DtoCallingConv(f->linkage));
149
4c577c2b7229 [svn r155] Fixed a bunch of linkage problems (especially with templates)
lindquist
parents: 144
diff changeset
375 else // fall back to C, it should be the right thing to do
132
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!!
lindquist
parents: 131
diff changeset
376 func->setCallingConv(llvm::CallingConv::C);
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!!
lindquist
parents: 131
diff changeset
377
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
378 fdecl->ir.irFunc->func = func;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
379 assert(llvm::isa<llvm::FunctionType>(f->ir.type->get()));
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
380
116
fd7ad91fd713 [svn r120] ModuleInfo implementation is now almost complete.
lindquist
parents: 113
diff changeset
381 // main
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
382 if (fdecl->isMain()) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
383 gIR->mainFunc = func;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
384 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
385
116
fd7ad91fd713 [svn r120] ModuleInfo implementation is now almost complete.
lindquist
parents: 113
diff changeset
386 // static ctor
163
a8cd9bc1021a [svn r179] lots and lots of fixes, much more of tango now compiles/works.
lindquist
parents: 162
diff changeset
387 if (fdecl->isStaticCtorDeclaration() && fdecl->getModule() == gIR->dmodule) {
116
fd7ad91fd713 [svn r120] ModuleInfo implementation is now almost complete.
lindquist
parents: 113
diff changeset
388 gIR->ctors.push_back(fdecl);
fd7ad91fd713 [svn r120] ModuleInfo implementation is now almost complete.
lindquist
parents: 113
diff changeset
389 }
fd7ad91fd713 [svn r120] ModuleInfo implementation is now almost complete.
lindquist
parents: 113
diff changeset
390 // static dtor
163
a8cd9bc1021a [svn r179] lots and lots of fixes, much more of tango now compiles/works.
lindquist
parents: 162
diff changeset
391 else if (fdecl->isStaticDtorDeclaration() && fdecl->getModule() == gIR->dmodule) {
116
fd7ad91fd713 [svn r120] ModuleInfo implementation is now almost complete.
lindquist
parents: 113
diff changeset
392 gIR->dtors.push_back(fdecl);
fd7ad91fd713 [svn r120] ModuleInfo implementation is now almost complete.
lindquist
parents: 113
diff changeset
393 }
fd7ad91fd713 [svn r120] ModuleInfo implementation is now almost complete.
lindquist
parents: 113
diff changeset
394
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
395 // we never reference parameters of function prototypes
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
396 if (!declareOnly)
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
397 {
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
398 // name parameters
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
399 llvm::Function::arg_iterator iarg = func->arg_begin();
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
400 int k = 0;
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
401 if (f->llvmRetInPtr) {
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
402 iarg->setName("retval");
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
403 fdecl->ir.irFunc->retArg = iarg;
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
404 ++iarg;
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
405 }
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
406 if (f->llvmUsesThis) {
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
407 iarg->setName("this");
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
408 fdecl->ir.irFunc->thisVar = iarg;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
409 assert(fdecl->ir.irFunc->thisVar);
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
410 ++iarg;
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
411 }
119
79c9ac745fbc [svn r123] Fixed some typeinfo module name mismatches.
lindquist
parents: 117
diff changeset
412
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
413 if (f->linkage == LINKd && f->varargs == 1) {
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
414 iarg->setName("_arguments");
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
415 fdecl->ir.irFunc->_arguments = iarg;
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
416 ++iarg;
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
417 iarg->setName("_argptr");
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
418 fdecl->ir.irFunc->_argptr = iarg;
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
419 ++iarg;
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
420 }
119
79c9ac745fbc [svn r123] Fixed some typeinfo module name mismatches.
lindquist
parents: 117
diff changeset
421
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
422 for (; iarg != func->arg_end(); ++iarg)
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
423 {
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
424 if (fdecl->parameters && fdecl->parameters->dim > k)
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
425 {
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
426 Dsymbol* argsym = (Dsymbol*)fdecl->parameters->data[k++];
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
427 VarDeclaration* argvd = argsym->isVarDeclaration();
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
428 assert(argvd);
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
429 assert(!argvd->ir.irLocal);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
430 argvd->ir.irLocal = new IrLocal(argvd);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
431 argvd->ir.irLocal->value = iarg;
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
432 iarg->setName(argvd->ident->toChars());
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
433 }
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
434 else
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
435 {
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
436 iarg->setName("unnamed");
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
437 }
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
438 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
439 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
440
121
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
441 if (fdecl->isUnitTestDeclaration())
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
442 gIR->unitTests.push_back(fdecl);
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
443
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
444 if (!declareOnly)
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
445 gIR->defineList.push_back(fdecl);
133
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
446 else
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents: 132
diff changeset
447 assert(func->getLinkage() != llvm::GlobalValue::InternalLinkage);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
448
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
449 Logger::cout() << "func decl: " << *func << '\n';
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
450 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
451
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
452 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
453
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
454 void DtoDefineFunc(FuncDeclaration* fd)
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
455 {
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
456 if (fd->ir.defined) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
457 fd->ir.defined = true;
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
458
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
459 assert(fd->ir.declared);
108
288fe1029e1f [svn r112] Fixed 'case 1,2,3:' style case statements.
lindquist
parents: 102
diff changeset
460
132
1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!!
lindquist
parents: 131
diff changeset
461 Logger::println("DtoDefineFunc(%s): %s", fd->toPrettyChars(), fd->loc.toChars());
102
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
462 LOG_SCOPE;
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up.
lindquist
parents: 100
diff changeset
463
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
464 // debug info
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
465 if (global.params.symdebug) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
466 Module* mo = fd->getModule();
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
467 fd->ir.irFunc->dwarfSubProg = DtoDwarfSubProgram(fd, DtoDwarfCompileUnit(mo));
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
468 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
469
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
470 Type* t = DtoDType(fd->type);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
471 TypeFunction* f = (TypeFunction*)t;
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
472 assert(f->ir.type);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
473
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
474 llvm::Function* func = fd->ir.irFunc->func;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
475 const llvm::FunctionType* functype = func->getFunctionType();
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
476
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
477 // only members of the current module or template instances maybe be defined
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
478 if (fd->getModule() == gIR->dmodule || DtoIsTemplateInstance(fd->parent))
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
479 {
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
480 fd->ir.DModule = gIR->dmodule;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
481
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
482 // function definition
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
483 if (fd->fbody != 0)
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
484 {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
485 Logger::println("Doing function body for: %s", fd->toChars());
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
486 assert(fd->ir.irFunc);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
487 gIR->functions.push_back(fd->ir.irFunc);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
488
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
489 if (fd->isMain())
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
490 gIR->emitMain = true;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
491
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
492 std::string entryname("entry_");
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
493 entryname.append(fd->toPrettyChars());
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
494
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
495 llvm::BasicBlock* beginbb = llvm::BasicBlock::Create(entryname,func);
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
496 llvm::BasicBlock* endbb = llvm::BasicBlock::Create("endentry",func);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
497
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
498 //assert(gIR->scopes.empty());
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
499 gIR->scopes.push_back(IRScope(beginbb, endbb));
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
500
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
501 // create alloca point
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
502 llvm::Instruction* allocaPoint = new llvm::AllocaInst(llvm::Type::Int32Ty, "alloca point", beginbb);
121
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
503 gIR->func()->allocapoint = allocaPoint;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
504
108
288fe1029e1f [svn r112] Fixed 'case 1,2,3:' style case statements.
lindquist
parents: 102
diff changeset
505 // need result variable? (not nested)
288fe1029e1f [svn r112] Fixed 'case 1,2,3:' style case statements.
lindquist
parents: 102
diff changeset
506 if (fd->vresult && !fd->vresult->nestedref) {
288fe1029e1f [svn r112] Fixed 'case 1,2,3:' style case statements.
lindquist
parents: 102
diff changeset
507 Logger::println("non-nested vresult value");
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
508 fd->vresult->ir.irLocal = new IrLocal(fd->vresult);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
509 fd->vresult->ir.irLocal->value = new llvm::AllocaInst(DtoType(fd->vresult->type),"function_vresult",allocaPoint);
108
288fe1029e1f [svn r112] Fixed 'case 1,2,3:' style case statements.
lindquist
parents: 102
diff changeset
510 }
288fe1029e1f [svn r112] Fixed 'case 1,2,3:' style case statements.
lindquist
parents: 102
diff changeset
511
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
512 // give arguments storage
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
513 if (fd->parameters)
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
514 {
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
515 size_t n = fd->parameters->dim;
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
516 for (int i=0; i < n; ++i)
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
517 {
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
518 Dsymbol* argsym = (Dsymbol*)fd->parameters->data[i];
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
519 VarDeclaration* vd = argsym->isVarDeclaration();
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
520 assert(vd);
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
521
136
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though
lindquist
parents: 133
diff changeset
522 if (!vd->needsStorage || vd->nestedref || vd->isRef() || vd->isOut() || DtoIsPassedByRef(vd->type))
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
523 continue;
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
524
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
525 LLValue* a = vd->ir.irLocal->value;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
526 assert(a);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
527 std::string s(a->getName());
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
528 Logger::println("giving argument '%s' storage", s.c_str());
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
529 s.append("_storage");
162
1856c62af24b [svn r178] Fixed codegen values for function arguments, the old approach was completely broken, amazing it even worked...
lindquist
parents: 157
diff changeset
530
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
531 LLValue* v = new llvm::AllocaInst(a->getType(),s,allocaPoint);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
532 gIR->ir->CreateStore(a,v);
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
533 vd->ir.irLocal->value = v;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
534 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
535 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
536
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
537 // debug info
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
538 if (global.params.symdebug) DtoDwarfFuncStart(fd);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
539
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
540 LLValue* parentNested = NULL;
131
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
541 if (FuncDeclaration* fd2 = fd->toParent2()->isFuncDeclaration()) {
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
542 if (!fd->isStatic()) // huh?
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
543 parentNested = fd2->ir.irFunc->nestedVar;
108
288fe1029e1f [svn r112] Fixed 'case 1,2,3:' style case statements.
lindquist
parents: 102
diff changeset
544 }
288fe1029e1f [svn r112] Fixed 'case 1,2,3:' style case statements.
lindquist
parents: 102
diff changeset
545
288fe1029e1f [svn r112] Fixed 'case 1,2,3:' style case statements.
lindquist
parents: 102
diff changeset
546 // need result variable? (nested)
288fe1029e1f [svn r112] Fixed 'case 1,2,3:' style case statements.
lindquist
parents: 102
diff changeset
547 if (fd->vresult && fd->vresult->nestedref) {
288fe1029e1f [svn r112] Fixed 'case 1,2,3:' style case statements.
lindquist
parents: 102
diff changeset
548 Logger::println("nested vresult value: %s", fd->vresult->toChars());
136
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though
lindquist
parents: 133
diff changeset
549 fd->nestedVars.insert(fd->vresult);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
550 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
551
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
552 // construct nested variables struct
136
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though
lindquist
parents: 133
diff changeset
553 if (!fd->nestedVars.empty() || parentNested) {
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
554 std::vector<const LLType*> nestTypes;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
555 int j = 0;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
556 if (parentNested) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
557 nestTypes.push_back(parentNested->getType());
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
558 j++;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
559 }
136
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though
lindquist
parents: 133
diff changeset
560 for (std::set<VarDeclaration*>::iterator i=fd->nestedVars.begin(); i!=fd->nestedVars.end(); ++i) {
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
561 VarDeclaration* vd = *i;
144
a27941d00351 [svn r149] fixed: a bunch of D-style variadics problems.
lindquist
parents: 139
diff changeset
562 Logger::println("referenced nested variable %s", vd->toChars());
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
563 if (!vd->ir.irLocal)
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
564 vd->ir.irLocal = new IrLocal(vd);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
565 vd->ir.irLocal->nestedIndex = j++;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
566 if (vd->isParameter()) {
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
567 if (!vd->ir.irLocal->value) {
144
a27941d00351 [svn r149] fixed: a bunch of D-style variadics problems.
lindquist
parents: 139
diff changeset
568 assert(vd == fd->vthis);
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
569 vd->ir.irLocal->value = fd->ir.irFunc->thisVar;
144
a27941d00351 [svn r149] fixed: a bunch of D-style variadics problems.
lindquist
parents: 139
diff changeset
570 }
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
571 assert(vd->ir.irLocal->value);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
572 nestTypes.push_back(vd->ir.irLocal->value->getType());
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
573 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
574 else {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
575 nestTypes.push_back(DtoType(vd->type));
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
576 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
577 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
578 const llvm::StructType* nestSType = llvm::StructType::get(nestTypes);
129
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents: 127
diff changeset
579 Logger::cout() << "nested var struct has type:" << *nestSType << '\n';
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
580 fd->ir.irFunc->nestedVar = new llvm::AllocaInst(nestSType,"nestedvars",allocaPoint);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
581 if (parentNested) {
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
582 assert(fd->ir.irFunc->thisVar);
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
583 LLValue* ptr = gIR->ir->CreateBitCast(fd->ir.irFunc->thisVar, parentNested->getType(), "tmp");
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
584 gIR->ir->CreateStore(ptr, DtoGEPi(fd->ir.irFunc->nestedVar, 0,0, "tmp"));
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
585 }
136
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though
lindquist
parents: 133
diff changeset
586 for (std::set<VarDeclaration*>::iterator i=fd->nestedVars.begin(); i!=fd->nestedVars.end(); ++i) {
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
587 VarDeclaration* vd = *i;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
588 if (vd->isParameter()) {
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
589 assert(vd->ir.irLocal);
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
590 gIR->ir->CreateStore(vd->ir.irLocal->value, DtoGEPi(fd->ir.irFunc->nestedVar, 0, vd->ir.irLocal->nestedIndex, "tmp"));
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
591 vd->ir.irLocal->value = fd->ir.irFunc->nestedVar;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
592 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
593 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
594 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
595
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
596 // copy _argptr to a memory location
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
597 if (f->linkage == LINKd && f->varargs == 1)
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
598 {
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
599 LLValue* argptrmem = new llvm::AllocaInst(fd->ir.irFunc->_argptr->getType(), "_argptrmem", gIR->topallocapoint());
173
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
600 new llvm::StoreInst(fd->ir.irFunc->_argptr, argptrmem, gIR->scopebb());
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes
ChristianK
parents: 163
diff changeset
601 fd->ir.irFunc->_argptr = argptrmem;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
602 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
603
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
604 // output function body
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
605 fd->fbody->toIR(gIR);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
606
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
607 // llvm requires all basic blocks to end with a TerminatorInst but DMD does not put a return statement
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
608 // in automatically, so we do it here.
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
609 if (!fd->isMain()) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
610 if (!gIR->scopereturned()) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
611 // pass the previous block into this block
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
612 if (global.params.symdebug) DtoDwarfFuncEnd(fd);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
613 if (func->getReturnType() == llvm::Type::VoidTy) {
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
614 llvm::ReturnInst::Create(gIR->scopebb());
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
615 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
616 else {
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
617 llvm::ReturnInst::Create(llvm::UndefValue::get(func->getReturnType()), gIR->scopebb());
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
618 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
619 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
620 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
621
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
622 // erase alloca point
121
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
623 allocaPoint->eraseFromParent();
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
624 allocaPoint = 0;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
625 gIR->func()->allocapoint = 0;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
626
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
627 gIR->scopes.pop_back();
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
628
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
629 // get rid of the endentry block, it's never used
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
630 assert(!func->getBasicBlockList().empty());
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
631 func->getBasicBlockList().pop_back();
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
632
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
633 // if the last block is empty now, it must be unreachable or it's a bug somewhere else
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
634 // would be nice to figure out how to assert that this is correct
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
635 llvm::BasicBlock* lastbb = &func->getBasicBlockList().back();
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
636 if (lastbb->empty()) {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
637 if (lastbb->getNumUses() == 0)
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
638 lastbb->eraseFromParent();
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
639 else {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
640 new llvm::UnreachableInst(lastbb);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
641 /*if (func->getReturnType() == llvm::Type::VoidTy) {
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
642 llvm::ReturnInst::Create(lastbb);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
643 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
644 else {
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
645 llvm::ReturnInst::Create(llvm::UndefValue::get(func->getReturnType()), lastbb);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
646 }*/
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
647 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
648 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
649
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
650 gIR->functions.pop_back();
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
651 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
652 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
653 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
654
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
655 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
656
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
657 void DtoMain()
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
658 {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
659 // emit main function llvm style
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
660 // int main(int argc, char**argv, char**env);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
661
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
662 assert(gIR != 0);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
663 IRState& ir = *gIR;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
664
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
665 assert(ir.emitMain && ir.mainFunc);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
666
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
667 // parameter types
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
668 std::vector<const LLType*> pvec;
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
669 pvec.push_back((const LLType*)llvm::Type::Int32Ty);
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
670 const LLType* chPtrType = (const LLType*)getPtrToType(llvm::Type::Int8Ty);
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
671 pvec.push_back((const LLType*)getPtrToType(chPtrType));
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
672 pvec.push_back((const LLType*)getPtrToType(chPtrType));
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
673 const LLType* rettype = (const LLType*)llvm::Type::Int32Ty;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
674
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
675 llvm::FunctionType* functype = llvm::FunctionType::get(rettype, pvec, false);
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
676 llvm::Function* func = llvm::Function::Create(functype,llvm::GlobalValue::ExternalLinkage,"main",ir.module);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
677
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
678 llvm::BasicBlock* bb = llvm::BasicBlock::Create("entry",func);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
679
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
680 // call static ctors
117
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
681 llvm::Function* fn = LLVM_D_GetRuntimeFunction(ir.module,"_moduleCtor");
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
682 llvm::Instruction* apt = llvm::CallInst::Create(fn,"",bb);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
683
121
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
684 // run unit tests if -unittest is provided
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
685 if (global.params.useUnitTests) {
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
686 fn = LLVM_D_GetRuntimeFunction(ir.module,"_moduleUnitTests");
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
687 llvm::Instruction* apt = llvm::CallInst::Create(fn,"",bb);
121
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
688 }
9c79b61fb638 [svn r125] Renamed/moved a few backend member inside DMD structures for consistency.
lindquist
parents: 119
diff changeset
689
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
690 // call user main function
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
691 const llvm::FunctionType* mainty = ir.mainFunc->getFunctionType();
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
692 llvm::CallInst* call;
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
693 if (mainty->getNumParams() > 0)
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
694 {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
695 // main with arguments
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
696 assert(mainty->getNumParams() == 1);
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
697 std::vector<LLValue*> args;
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
698 llvm::Function* mfn = LLVM_D_GetRuntimeFunction(ir.module,"_d_main_args");
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
699
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
700 llvm::Function::arg_iterator argi = func->arg_begin();
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
701 args.push_back(argi++);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
702 args.push_back(argi++);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
703
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
704 const LLType* at = mainty->getParamType(0)->getContainedType(0);
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
705 LLValue* arr = new llvm::AllocaInst(at->getContainedType(1)->getContainedType(0), func->arg_begin(), "argstorage", apt);
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
706 LLValue* a = new llvm::AllocaInst(at, "argarray", apt);
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
707 LLValue* ptr = DtoGEPi(a,0,0,"tmp",bb);
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
708 LLValue* v = args[0];
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
709 if (v->getType() != DtoSize_t())
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
710 v = new llvm::ZExtInst(v, DtoSize_t(), "tmp", bb);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
711 new llvm::StoreInst(v,ptr,bb);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
712 ptr = DtoGEPi(a,0,1,"tmp",bb);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
713 new llvm::StoreInst(arr,ptr,bb);
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
714 args.push_back(a);
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
715 llvm::CallInst::Create(mfn, args.begin(), args.end(), "", bb);
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
716 call = llvm::CallInst::Create(ir.mainFunc,a,"ret",bb);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
717 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
718 else
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
719 {
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
720 // main with no arguments
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
721 call = llvm::CallInst::Create(ir.mainFunc,"ret",bb);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
722 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
723 call->setCallingConv(ir.mainFunc->getCallingConv());
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
724
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
725 // call static dtors
117
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
726 fn = LLVM_D_GetRuntimeFunction(ir.module,"_moduleDtor");
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
727 llvm::CallInst::Create(fn,"",bb);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
728
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
729 // return
205
9d44ec83acd1 [svn r221] Update: Switched to the 2.3 LLVM svn branch, http://llvm.org/svn/llvm-project/llvm/branches/release_23 .
lindquist
parents: 173
diff changeset
730 llvm::ReturnInst::Create(call,bb);
100
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
731 }
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
732
5071469303d4 [svn r104] TONS OF FIXES.
lindquist
parents:
diff changeset
733 //////////////////////////////////////////////////////////////////////////////////////////
117
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
734
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
735 const llvm::FunctionType* DtoBaseFunctionType(FuncDeclaration* fdecl)
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
736 {
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
737 Dsymbol* parent = fdecl->toParent();
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
738 ClassDeclaration* cd = parent->isClassDeclaration();
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
739 assert(cd);
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
740
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
741 FuncDeclaration* f = fdecl;
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
742
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
743 while (cd)
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
744 {
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
745 ClassDeclaration* base = cd->baseClass;
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
746 if (!base)
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
747 break;
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
748 FuncDeclaration* f2 = base->findFunc(fdecl->ident, (TypeFunction*)fdecl->type);
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
749 if (f2) {
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
750 f = f2;
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
751 cd = base;
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
752 }
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
753 else
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
754 break;
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
755 }
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
756
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
757 DtoResolveDsymbol(f);
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
758 return llvm::cast<llvm::FunctionType>(DtoType(f->type));
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
759 }
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
760
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents: 116
diff changeset
761 //////////////////////////////////////////////////////////////////////////////////////////
131
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
762
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
763 DValue* DtoArgument(Argument* fnarg, Expression* argexp)
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
764 {
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
765 Logger::println("DtoArgument");
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
766 LOG_SCOPE;
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
767
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
768 DValue* arg = argexp->toElem(gIR);
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
769
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
770 // ref/out arg
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
771 if (fnarg && ((fnarg->storageClass & STCref) || (fnarg->storageClass & STCout)))
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
772 {
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
773 if (arg->isVar() || arg->isLRValue())
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
774 arg = new DImValue(argexp->type, arg->getLVal(), false);
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
775 else
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
776 arg = new DImValue(argexp->type, arg->getRVal(), false);
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
777 }
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
778 // aggregate arg
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
779 else if (DtoIsPassedByRef(argexp->type))
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
780 {
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
781 LLValue* alloc = new llvm::AllocaInst(DtoType(argexp->type), "tmpparam", gIR->topallocapoint());
131
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
782 DVarValue* vv = new DVarValue(argexp->type, alloc, true);
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
783 DtoAssign(vv, arg);
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
784 arg = vv;
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
785 }
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
786 // normal arg (basic/value type)
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
787 else
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
788 {
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
789 // nothing to do
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
790 }
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
791
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
792 return arg;
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
793 }
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
794
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
795 //////////////////////////////////////////////////////////////////////////////////////////
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
796
213
7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango.
lindquist
parents: 205
diff changeset
797 void DtoVariadicArgument(Expression* argexp, LLValue* dst)
131
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
798 {
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
799 Logger::println("DtoVariadicArgument");
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
800 LOG_SCOPE;
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
801 DVarValue* vv = new DVarValue(argexp->type, dst, true);
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
802 DtoAssign(vv, argexp->toElem(gIR));
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
803 }
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
804
5825d48b27d1 [svn r135] * Merged DMD 1.025 *
lindquist
parents: 129
diff changeset
805 //////////////////////////////////////////////////////////////////////////////////////////