Changeset 778:4adf0f742896

Timestamp:

11/22/08 12:35:52 (2 months ago)

Author:

Christian Kamm <kamm incasoftware de>

branch:

default

Message:

Get rid of DtoBoolean? - use DtoCast?(... Type::tbool) instead.
Fixed some casts to bool that were using truncation.

Files:

• gen/arrays.cpp (modified) (1 diff)
• gen/classes.cpp (modified) (2 diffs)
• gen/complex.cpp (modified) (1 diff)
• gen/llvmhelpers.cpp (modified) (6 diffs)
• gen/llvmhelpers.h (modified) (1 diff)
• gen/statements.cpp (modified) (4 diffs)
• gen/toir.cpp (modified) (8 diffs)

gen/arrays.cpp

@@ -946 +946 @@
-        assert(0);
-    }
+    else if (totype->ty == Tbool) {
+        // return (arr.ptr !is null)
+        LLValue* ptr = DtoArrayPtr(u);
+        LLConstant* nul = getNullPtr(ptr->getType());
+        rval = gIR->ir->CreateICmpNE(ptr, nul, "tmp");
+    }
-    else {
-        assert(0);

gen/classes.cpp

@@ -925 +925 @@
-    Type* to = _to->toBasetype();
-    if (to->ty == Tpointer) {
+        Logger::println("to pointer");
-        const LLType* tolltype = DtoType(_to);
-        LLValue* rval = DtoBitCast(val->getRVal(), tolltype);
-        return new DImValue(_to, rval);
+    }
+    else if (to->ty == Tbool) {
+        Logger::println("to bool");
+        LLValue* llval = val->getRVal();
+        LLValue* zero = LLConstant::getNullValue(llval->getType());
+        return new DImValue(_to, gIR->ir->CreateICmpNE(llval, zero, "tmp"));
-    }
-
@@ -948 +955 @@
-    }
-    else {
-object
+class
-        int poffset;
-        if (fc->sym->isInterfaceDeclaration()) {

gen/complex.cpp

@@ -455 +455 @@
-        return DtoCastFloat(loc, re, to);
-    }
+    else if (to->ty == Tbool) {
+        return new DImValue(_to, DtoComplexEquals(loc, TOKnotequal, val, DtoNullValue(vty)));
+    }
-    else
-    assert(0);

gen/llvmhelpers.cpp

@@ -570 +570 @@
-    }
-
-
+
+
+
+
+
-        if (fromsz < tosz || from->ty == Tbool) {
-            if (Logger::enabled())
@@ -580 +584 @@
-            }
-        }
- || to->ty == Tbool
+
-            rval = new llvm::TruncInst(rval, tolltype, "tmp", gIR->scopebb());
-        }
@@ -627 +631 @@
-        rval = DtoBitCast(src, tolltype);
-    }
+    else if (totype->ty == Tbool) {
+        LLValue* src = val->getRVal();
+        LLValue* zero = LLConstant::getNullValue(src->getType());
+        rval = gIR->ir->CreateICmpNE(src, zero, "tmp");
+    }
-    else if (totype->isintegral()) {
-        rval = new llvm::PtrToIntInst(val->getRVal(), tolltype, "tmp", gIR->scopebb());
@@ -654 +663 @@
-    LLValue* rval;
-
-
+
+
+
+
+
+
-        return DtoComplex(loc, to, val);
-    }
@@ -694 +708 @@
-    {
-        return DtoPaintType(loc, val, to);
+    }
+    else if (to->toBasetype()->ty == Tbool)
+    {
+        return new DImValue(to, DtoDelegateEquals(TOKnotequal, val->getRVal(), NULL));
-    }
-    else
@@ -1615 +1633 @@
-//////////////////////////////////////////////////////////////////////////////////////////
-
-LLValue* DtoBoolean(Loc& loc, DValue* dval)
-{
-    Type* dtype = dval->getType()->toBasetype();
-    TY ty = dtype->ty;
-
-    // integer
-    if (dtype->isintegral())
-    {
-        LLValue* val = dval->getRVal();
-        if (val->getType() == LLType::Int1Ty)
-            return val;
-        else {
-            LLValue* zero = LLConstantInt::get(val->getType(), 0, false);
-            return gIR->ir->CreateICmpNE(val, zero, "tmp");
-        }
-    }
-    // complex
-    else if (dtype->iscomplex())
-    {
-        return DtoComplexEquals(loc, TOKnotequal, dval, DtoNullValue(dtype));
-    }
-    // floating point
-    else if (dtype->isfloating())
-    {
-        LLValue* val = dval->getRVal();
-        LLValue* zero = LLConstant::getNullValue(val->getType());
-        return gIR->ir->CreateFCmpONE(val, zero, "tmp");
-    }
-    // pointer/class
-    else if (ty == Tpointer || ty == Tclass) {
-        LLValue* val = dval->getRVal();
-        LLValue* zero = LLConstant::getNullValue(val->getType());
-        if (Logger::enabled())
-        {
-            Logger::cout() << "val:  " << *val << '\n';
-            Logger::cout() << "zero: " << *zero << '\n';
-        }
-        return gIR->ir->CreateICmpNE(val, zero, "tmp");
-    }
-    // dynamic array
-    else if (ty == Tarray)
-    {
-        // return (arr.ptr !is null)
-        LLValue* ptr = DtoArrayPtr(dval);
-        LLConstant* nul = getNullPtr(ptr->getType());
-        return gIR->ir->CreateICmpNE(ptr, nul, "tmp");
-    }
-    // delegate
-    else if (ty == Tdelegate)
-    {
-        // return (dg !is null)
-        return DtoDelegateEquals(TOKnotequal, dval->getRVal(), NULL);
-    }
-    // unknown
-    std::cout << "unsupported -> bool : " << dtype->toChars() << '\n';
-    assert(0);
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-void DtoOverloadedIntrinsicName(TemplateInstance* ti, TemplateDeclaration* td, std::string& name)
-{

gen/llvmhelpers.h

@@ -109 +109 @@
-void findDefaultTarget();
-
-/// Converts any value to a boolean (llvm i1)
-LLValue* DtoBoolean(Loc& loc, DValue* dval);
-
-/// get the default initializer of the type
-LLConstant* DtoDefaultInit(Type* t);

gen/statements.cpp

@@ -169 +169 @@
-        if (Logger::enabled())
-            Logger::cout() << "if conditional: " << *cond_val << '\n';
-Boolean(loc, cond_e
+Cast(loc, cond_e, Type::tbool)->getRVal(
-    }
-    LLValue* ifgoback = llvm::BranchInst::Create(ifbb, elsebb, cond_val, gIR->scopebb());
@@ -257 +257 @@
-    // create the condition
-    DValue* cond_e = condition->toElem(p);
-Boolean(loc, cond_e
+Cast(loc, cond_e, Type::tbool)->getRVal(
-    delete cond_e;
-
@@ -313 +313 @@
-    // create the condition
-    DValue* cond_e = condition->toElem(p);
-Boolean(loc, cond_e
+Cast(loc, cond_e, Type::tbool)->getRVal(
-    delete cond_e;
-
@@ -358 +358 @@
-    {
-        DValue* cond_e = condition->toElem(p);
-Boolean(loc, cond_e
+Cast(loc, cond_e, Type::tbool)->getRVal(
-        delete cond_e;
-    }

gen/toir.cpp

@@ -1650 +1650 @@
-
-        // test condition
-Boolean(loc, cond
+Cast(loc, cond, Type::tbool)->getRVal(
-
-        // branch
@@ -1676 +1676 @@
-    DValue* u = e1->toElem(p);
-
-Boolean(loc, u
+Cast(loc, u, Type::tbool)->getRVal(
-
-    LLConstant* zero = DtoConstBool(false);
@@ -1702 +1702 @@
-    llvm::BasicBlock* andandend = llvm::BasicBlock::Create("andandend", gIR->topfunc(), oldend);
-
-Boolean(loc, u
+Cast(loc, u, Type::tbool)->getRVal(
-    DtoStore(ubool,resval);
-    llvm::BranchInst::Create(andand,andandend,ubool,p->scopebb());
@@ -1709 +1709 @@
-    DValue* v = e2->toElem(p);
-
-Boolean(loc, v
+Cast(loc, v, Type::tbool)->getRVal(
-    LLValue* uandvbool = llvm::BinaryOperator::Create(llvm::BinaryOperator::And, ubool, vbool,"tmp",p->scopebb());
-    DtoStore(uandvbool,resval);
@@ -1738 +1738 @@
-    llvm::BasicBlock* ororend = llvm::BasicBlock::Create("ororend", gIR->topfunc(), oldend);
-
-Boolean(loc, u
+Cast(loc, u, Type::tbool)->getRVal(
-    DtoStore(ubool,resval);
-    llvm::BranchInst::Create(ororend,oror,ubool,p->scopebb());
@@ -1745 +1745 @@
-    DValue* v = e2->toElem(p);
-
-Boolean(loc, v
+Cast(loc, v, Type::tbool)->getRVal(
-    DtoStore(vbool,resval);
-    llvm::BranchInst::Create(ororend,p->scopebb());
@@ -2000 +2000 @@
-
-    DValue* c = econd->toElem(p);
-Boolean(loc, c
+Cast(loc, c, Type::tbool)->getRVal(
-    llvm::BranchInst::Create(condtrue,condfalse,cond_val,p->scopebb());
-
@@ -2421 +2421 @@
-DValue* BoolExp::toElem(IRState* p)
-{
-Boolean(loc, e1->toElem(p)
+Cast(loc, e1->toElem(p), Type::tbool)->getRVal(
-}
-