From d4c78c07996fcbfb7b2f3d8bb6b4f3f88b864fc8 Mon Sep 17 00:00:00 2001
From: Brian Fiete <bfiete@gmail.com>
Date: Sun, 23 Aug 2020 10:31:56 -0700
Subject: [PATCH] Allow explicit bool-to-number casts

---
 IDEHelper/Backend/BeMCContext.cpp        | 10 +++++-----
 IDEHelper/Compiler/BfIRCodeGen.cpp       |  6 ++++--
 IDEHelper/Compiler/BfModuleTypeUtils.cpp |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/IDEHelper/Backend/BeMCContext.cpp b/IDEHelper/Backend/BeMCContext.cpp
index 6cb2d95a..4185f440 100644
--- a/IDEHelper/Backend/BeMCContext.cpp
+++ b/IDEHelper/Backend/BeMCContext.cpp
@@ -3734,7 +3734,7 @@ BeMCOperand BeMCContext::AllocVirtualReg(BeType* type, int refCount, bool mustBe
 
 	if (mDebugging)
 	{
-		if (mcOperand.mVRegIdx == 29)
+		if (mcOperand.mVRegIdx == 9)
 		{
 			NOP;
 		}
@@ -10267,7 +10267,7 @@ bool BeMCContext::DoLegalization()
 
 					}
 
-					if ((arg0Type->IsFloat()) && (arg1Type->IsInt()))
+					if ((arg0Type->IsFloat()) && (arg1Type->IsIntable()))
 					{
 						if ((arg1Type->mTypeCode == BeTypeCode_Int64) && (!isSignedExt))
 						{
@@ -15792,7 +15792,7 @@ void BeMCContext::Generate(BeFunction* function)
 						auto toType = castedInst->mToType;
 						auto toValue = AllocVirtualReg(castedInst->mToType);
 						CreateDefineVReg(toValue);
-						if ((toType->IsInt()) && (fromType->IsInt()) && (toType->mSize < fromType->mSize))
+						if ((toType->IsIntable()) && (fromType->IsIntable()) && (toType->mSize < fromType->mSize))
 						{
 							// For truncating values, no actual instructions are needed, so we can just do a vreg relto ref
 							auto vregInfo = mVRegInfo[toValue.mVRegIdx];
@@ -15801,8 +15801,8 @@ void BeMCContext::Generate(BeFunction* function)
 						}
 						else
 						{
-							bool doSignExtension = (toType->IsInt()) && (fromType->IsInt()) && (toType->mSize > fromType->mSize) && (castedInst->mToSigned) && (castedInst->mValSigned);
-							if ((toType->IsFloat()) && (fromType->IsInt()) && (castedInst->mValSigned))
+							bool doSignExtension = (toType->IsIntable()) && (fromType->IsIntable()) && (toType->mSize > fromType->mSize) && (castedInst->mToSigned) && (castedInst->mValSigned);
+							if ((toType->IsFloat()) && (fromType->IsIntable()) && (castedInst->mValSigned))
 								doSignExtension = true;
 							if (doSignExtension)
 							{
diff --git a/IDEHelper/Compiler/BfIRCodeGen.cpp b/IDEHelper/Compiler/BfIRCodeGen.cpp
index 80899798..c415a2cb 100644
--- a/IDEHelper/Compiler/BfIRCodeGen.cpp
+++ b/IDEHelper/Compiler/BfIRCodeGen.cpp
@@ -466,6 +466,8 @@ BfTypeCode BfIRCodeGen::GetTypeCode(llvm::Type* type, bool isSigned)
 	{
 		switch (type->getIntegerBitWidth())
 		{
+		case 1:
+			return BfTypeCode_Boolean;
 		case 8:
 			return isSigned ? BfTypeCode_Int8 : BfTypeCode_UInt8;			
 		case 16:
@@ -1510,7 +1512,7 @@ void BfIRCodeGen::HandleNextCmd()
 			if (BfIRBuilder::IsInt(typeCode))
 			{			
 				// Int -> Int
-				if (BfIRBuilder::IsInt(valTypeCode))
+				if ((BfIRBuilder::IsInt(valTypeCode)) || (valTypeCode == BfTypeCode_Boolean))
 				{
 					retVal = mIRBuilder->CreateIntCast(val, toLLVMType, toSigned && valIsSigned);
 				}
@@ -1525,7 +1527,7 @@ void BfIRCodeGen::HandleNextCmd()
 			else
 			{
 				// Int -> Float
-				if (BfIRBuilder::IsInt(valTypeCode))
+				if ((BfIRBuilder::IsInt(valTypeCode)) || (valTypeCode == BfTypeCode_Boolean))
 				{				
 					if (BfIRBuilder::IsSigned(valTypeCode))
 						retVal = mIRBuilder->CreateSIToFP(val, toLLVMType);
diff --git a/IDEHelper/Compiler/BfModuleTypeUtils.cpp b/IDEHelper/Compiler/BfModuleTypeUtils.cpp
index 35f663fe..db72003a 100644
--- a/IDEHelper/Compiler/BfModuleTypeUtils.cpp
+++ b/IDEHelper/Compiler/BfModuleTypeUtils.cpp
@@ -10343,7 +10343,7 @@ BfIRValue BfModule::CastToValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp
 
 		if (explicitCast)
 		{
-			if (((fromPrimType->IsIntegral()) || (fromPrimType->IsFloat())) &&
+			if (((fromPrimType->IsIntegral()) || (fromPrimType->IsFloat()) || (fromPrimType->IsBoolean())) &&
 				((toType->IsIntegral()) || (toType->IsFloat())))
 				allowCast = true;
 		}