1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 20:42:21 +02:00

Added RefType, changed how CRepr types are represented

This commit is contained in:
Brian Fiete 2020-07-02 11:05:17 -07:00
parent 716f7b3638
commit 0c946de3ca
13 changed files with 311 additions and 40 deletions

View file

@ -216,10 +216,6 @@ BF_STATIC_ASSERT(BF_ARRAY_COUNT(gIRCmdNames) == BfIRCmd_COUNT);
#define CMD_PARAM(ty, name) ty name; Read(name);
template <typename T>
class CmdParamVec : public SizedArray<T, 8>
{};
BeIRCodeGen::BeIRCodeGen()
{
mBfIRBuilder = NULL;
@ -390,6 +386,33 @@ BeIRTypeEntry& BeIRCodeGen::GetTypeEntry(int typeId)
return typeEntry;
}
void BeIRCodeGen::FixValues(BeStructType* structType, CmdParamVec<BeValue*>& values)
{
if (values.size() >= structType->mMembers.size())
return;
int readIdx = values.size() - 1;
values.resize(structType->mMembers.size());
for (int i = (int)values.size() - 1; i >= 0; i--)
{
if (mBeContext->AreTypesEqual(values[readIdx]->GetType(), structType->mMembers[i].mType))
{
values[i] = values[readIdx];
readIdx--;
}
else if (structType->mMembers[i].mType->IsSizedArray())
{
auto beConst = mBeModule->mAlloc.Alloc<BeConstant>();
beConst->mType = structType->mMembers[i].mType;
values[i] = beConst;
}
else
{
FatalError("Malformed structure values");
}
}
}
void BeIRCodeGen::Init(const BfSizedArray<uint8>& buffer)
{
BP_ZONE("BeIRCodeGen::Init");
@ -754,6 +777,15 @@ void BeIRCodeGen::Read(BeValue*& beValue)
BE_MEM_END("ParamType_Const_Array");
return;
}
else if (constType == BfConstType_ArrayZero8)
{
CMD_PARAM(int, count);
auto beType = mBeContext->CreateSizedArrayType(mBeContext->GetPrimitiveType(BeTypeCode_Int8), count);
auto beConst = mBeModule->mAlloc.Alloc<BeConstant>();
beConst->mType = beType;
beValue = beConst;
return;
}
bool isSigned = false;
BeType* llvmConstType = GetBeType(typeCode, isSigned);
@ -1054,11 +1086,14 @@ void BeIRCodeGen::HandleNextCmd()
auto constStruct = mBeModule->mOwnedValues.Alloc<BeStructConstant>();
constStruct->mType = type;
BF_ASSERT(type->IsStruct());
FixValues((BeStructType*)type, values);
BF_ASSERT(((BeStructType*)type)->mMembers.size() == values.size());
for (int i = 0; i < (int)values.size(); i++)
{
auto val = values[i];
BF_ASSERT(((BeStructType*)type)->mMembers[i].mType == val->GetType());
BF_ASSERT(mBeContext->AreTypesEqual(((BeStructType*)type)->mMembers[i].mType, val->GetType()));
constStruct->mMemberValues.push_back(BeValueDynCast<BeConstant>(val));
}
SetResult(curId, constStruct);

View file

@ -53,6 +53,11 @@ public:
}
};
template <typename T>
class CmdParamVec : public SizedArray<T, 8>
{};
class BeIRCodeGen : public BfIRCodeGenBase
{
public:
@ -83,7 +88,9 @@ public:
void SetResult(int id, BeMDNode* md);
BeType* GetBeType(BfTypeCode typeCode, bool& isSigned);
BeIRTypeEntry& GetTypeEntry(int typeId);
BeIRTypeEntry& GetTypeEntry(int typeId);
void FixValues(BeStructType* structType, CmdParamVec<BeValue*>& values);
public:
BeIRCodeGen();