Mercurial > projects > ldc
diff gen/tollvm.c @ 54:28e99b04a132 trunk
[svn r58] Fixed cond expression resulting in a non-basic type.
Fixed identity expression for dynamic arrays.
Revamped the system to keep track of lvalues and rvalues and their relations.
Typedef declaration now generate the custom typeinfo.
Other bugfixes.
| author | lindquist |
|---|---|
| date | Wed, 24 Oct 2007 01:37:34 +0200 |
| parents | 06ccc817acd4 |
| children | 0ccfae271c45 |
line wrap: on
line diff
--- a/gen/tollvm.c Tue Oct 23 07:16:02 2007 +0200 +++ b/gen/tollvm.c Wed Oct 24 01:37:34 2007 +0200 @@ -1100,14 +1100,14 @@ { llvm::Value* retval = 0; - bool haslvals = !gIR->lvals.empty(); + bool haslvals = !gIR->exps.empty(); if (haslvals) - gIR->lvals.push_back(NULL); + gIR->exps.push_back(IRExp(NULL,NULL,NULL)); elem* arg = argexp->toElem(gIR); if (haslvals) - gIR->lvals.pop_back(); + gIR->exps.pop_back(); if (arg->inplace) { assert(arg->mem != 0); @@ -1254,3 +1254,29 @@ gIR->ir->CreateStore(rhs, lhs); } } + +////////////////////////////////////////////////////////////////////////////////////////// + +llvm::ConstantInt* LLVM_DtoConstSize_t(size_t i) +{ + return llvm::ConstantInt::get(LLVM_DtoSize_t(), i, false); +} +llvm::ConstantInt* LLVM_DtoConstUint(unsigned i) +{ + return llvm::ConstantInt::get(llvm::Type::Int32Ty, i, false); +} + +////////////////////////////////////////////////////////////////////////////////////////// + +llvm::Constant* LLVM_DtoConstString(const char* str) +{ + std::string s(str); + llvm::Constant* init = llvm::ConstantArray::get(s, true); + llvm::GlobalVariable* gvar = new llvm::GlobalVariable( + init->getType(), true,llvm::GlobalValue::InternalLinkage, init, "stringliteral", gIR->module); + llvm::Constant* idxs[2] = { LLVM_DtoConstUint(0), LLVM_DtoConstUint(0) }; + return LLVM_DtoConstantSlice( + LLVM_DtoConstSize_t(s.length()), + llvm::ConstantExpr::getGetElementPtr(gvar,idxs,2) + ); +}