Mercurial > projects > ldc
view gen/binops.cpp @ 1442:0a5f7890f327
Adjust some more code that was depending on the function and delegate calling
conventions being equal.
There's also an instance in `tango.text.convert.Layout` that should be adjusted:
{{{
Index: tango/text/convert/Layout.d
===================================================================
--- tango/text/convert/Layout.d (revision 4578)
+++ tango/text/convert/Layout.d (working copy)
-660,8 +660,12 @@
case TypeCode.STRUCT:
auto s = cast(TypeInfo_Struct) type;
- if (s.xtoString)
- return Utf.fromString8 (s.xtoString(p), result);
+ if (s.xtoString) {
+ char[] delegate() toString;
+ toString.ptr = p;
+ toString.funcptr = cast(char[] function()) s.xtoString;
+ return Utf.fromString8 (toString(), result);
+ }
goto default;
case TypeCode.INTERFACE:
}}}
author | Frits van Bommel <fvbommel wxs.nl> |
---|---|
date | Sun, 31 May 2009 15:27:01 +0200 |
parents | ca2dfe98036c |
children | cc5fee7836dc |
line wrap: on
line source
#include "gen/llvm.h" #include "declaration.h" #include "gen/irstate.h" #include "gen/tollvm.h" #include "gen/dvalue.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 ); }