Mercurial > projects > ldc
view gen/binops.cpp @ 1605:1d5721f9ae18
[WIP] Merge DMD r251: bugzilla 111 (appending a dchar to a char[])
This patch needs some work in the code generation, because of the runtime
changes (functions "_d_arrayappendcd" and "_d_arrayappendwd" are added).
This doesn't affect existing code though, it just makes with patch
a little useless, because something like this:
char [] s;
s ~= '\u6211';
That failed to compile with a nice error message previously to this
change, now fails with and ugly error message (a failed assertion).
Apparently there is a regression introduced by this patch too, when
compiling Dil I get this assertion message:
ldc: /home/luca/tesis/ldc/gen/statements.cpp:132: virtual void ReturnStatement::toIR(IRState*): Assertion `p->topfunc()->getReturnType() == llvm::Type::getVoidTy(gIR->context())' failed.
0 ldc 0x08a91628
Thank god we have bisecting capabilities in VCSs now ;)
---
dmd/expression.c | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
author | Leandro Lucarella <llucax@gmail.com> |
---|---|
date | Wed, 06 Jan 2010 15:18:19 -0300 |
parents | cc5fee7836dc |
children |
line wrap: on
line source
#include "gen/llvm.h" #include "declaration.h" #include "gen/irstate.h" #include "gen/tollvm.h" #include "gen/dvalue.h" #include "gen/logger.h" #include "gen/complex.h" ////////////////////////////////////////////////////////////////////////////// DValue* DtoBinAdd(DValue* lhs, DValue* rhs) { LLValue* v = gIR->ir->CreateAdd(lhs->getRVal(), rhs->getRVal(), "tmp"); return new DImValue( lhs->getType(), v ); } ////////////////////////////////////////////////////////////////////////////// DValue* DtoBinSub(DValue* lhs, DValue* rhs) { LLValue* v = gIR->ir->CreateSub(lhs->getRVal(), rhs->getRVal(), "tmp"); return new DImValue( lhs->getType(), v ); } ////////////////////////////////////////////////////////////////////////////// DValue* DtoBinMul(Type* targettype, DValue* lhs, DValue* rhs) { LLValue* v = gIR->ir->CreateMul(lhs->getRVal(), rhs->getRVal(), "tmp"); return new DImValue( targettype, v ); } ////////////////////////////////////////////////////////////////////////////// DValue* DtoBinDiv(Type* targettype, DValue* lhs, DValue* rhs) { Type* t = lhs->getType(); LLValue *l, *r; l = lhs->getRVal(); r = rhs->getRVal(); LLValue* res; if (t->isfloating()) res = gIR->ir->CreateFDiv(l, r, "tmp"); else if (!t->isunsigned()) res = gIR->ir->CreateSDiv(l, r, "tmp"); else res = gIR->ir->CreateUDiv(l, r, "tmp"); return new DImValue( targettype, res ); } ////////////////////////////////////////////////////////////////////////////// DValue* DtoBinRem(Type* targettype, DValue* lhs, DValue* rhs) { Type* t = lhs->getType(); LLValue *l, *r; l = lhs->getRVal(); r = rhs->getRVal(); LLValue* res; if (t->isfloating()) res = gIR->ir->CreateFRem(l, r, "tmp"); else if (!t->isunsigned()) res = gIR->ir->CreateSRem(l, r, "tmp"); else res = gIR->ir->CreateURem(l, r, "tmp"); return new DImValue( targettype, res ); } ////////////////////////////////////////////////////////////////////////////// LLValue* DtoBinNumericEquals(Loc loc, DValue* lhs, DValue* rhs, TOK op) { assert(op == TOKequal || op == TOKnotequal || op == TOKidentity || op == TOKnotidentity); Type* t = lhs->getType()->toBasetype(); assert(t->isfloating()); Logger::println("numeric equality"); LLValue* lv = lhs->getRVal(); LLValue* rv = rhs->getRVal(); LLValue* res = 0; if (t->iscomplex()) { Logger::println("complex"); res = DtoComplexEquals(loc, op, lhs, rhs); } else if (t->isfloating()) { Logger::println("floating"); res = (op == TOKidentity || op == TOKequal) ? gIR->ir->CreateFCmpOEQ(lv,rv,"tmp") : gIR->ir->CreateFCmpUNE(lv,rv,"tmp"); } assert(res); return res; }