Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-09 12:02:21 +02:00
Code Activity

Improved enum displays and [Type] for System.Type

Browse source
This commit is contained in:
Brian Fiete 2022-03-17 16:56:56 -07:00
parent 7dc09b38f9
commit e64ba8a8a3
1 changed files with 104 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

145
IDEHelper/Compiler/CeDebugger.cpp
View file

@ -3313,69 +3313,115 @@ String CeDebugger::TypedValueToString(const BfTypedValue& origTypedValue, const
if (typedValue.mType->IsEnum()) if (typedValue.mType->IsEnum())
{ {
if (formatInfo.mRawString)
return "";
String retVal; String retVal;
int64 bitsLeft = ValueToInt(typedValue); if (typedValue.mType->IsTypedPrimitive())
int valueCount = 0; {
int64 bitsLeft = ValueToInt(typedValue);
int valueCount = 0;
String editVal; String editVal;
auto typeInst = typedValue.mType->ToTypeInstance();
auto dbgTypeInfo = GetDbgTypeInfo(typedValue.mType->mTypeId);
while ((dbgTypeInfo != NULL) && ((bitsLeft != 0) || (valueCount == 0))) auto typeInst = typedValue.mType->ToTypeInstance();
{ auto dbgTypeInfo = GetDbgTypeInfo(typedValue.mType->mTypeId);
CeDbgTypeInfo::ConstIntEntry* bestMatch = NULL;
for (auto& constIntEntry : dbgTypeInfo->mConstIntEntries) while ((dbgTypeInfo != NULL) && ((bitsLeft != 0) || (valueCount == 0)))
{ {
if (constIntEntry.mVal == bitsLeft) CeDbgTypeInfo::ConstIntEntry* bestMatch = NULL;
{
bestMatch = &constIntEntry;
break;
}
}
if (bestMatch == NULL)
{
for (auto& constIntEntry : dbgTypeInfo->mConstIntEntries) for (auto& constIntEntry : dbgTypeInfo->mConstIntEntries)
{ {
if ((constIntEntry.mVal != 0) && if (constIntEntry.mVal == bitsLeft)
((constIntEntry.mVal & bitsLeft) == constIntEntry.mVal))
{ {
bestMatch = &constIntEntry; bestMatch = &constIntEntry;
break; break;
} }
} }
if (bestMatch == NULL)
{
for (auto& constIntEntry : dbgTypeInfo->mConstIntEntries)
{
if ((constIntEntry.mVal != 0) &&
((constIntEntry.mVal & bitsLeft) == constIntEntry.mVal))
{
bestMatch = &constIntEntry;
break;
}
}
}
if (bestMatch == NULL)
break;
if (valueCount > 0)
{
retVal += " | ";
}
auto bestFieldInstance = &typeInst->mFieldInstances[bestMatch->mFieldIdx];
retVal += ".";
retVal += bestFieldInstance->GetFieldDef()->mName;
valueCount++;
bitsLeft &= ~bestMatch->mVal;
} }
if (bestMatch == NULL) if ((valueCount == 0) || (bitsLeft != 0))
break;
if (valueCount > 0)
{ {
retVal += " | "; if (valueCount > 0)
retVal += " | ";
retVal += StrFormat("%lld", bitsLeft);
} }
auto bestFieldInstance = &typeInst->mFieldInstances[bestMatch->mFieldIdx];
retVal += "."; retVal += "\n" + TypeToString(origTypedValue.mType, typeModKind);
retVal += bestFieldInstance->GetFieldDef()->mName; retVal += "\n:canEdit";
valueCount++; return retVal;
bitsLeft &= ~bestMatch->mVal;
} }
else if (typedValue.mType->mDefineState >= BfTypeDefineState_Defined)
if ((valueCount == 0) || (bitsLeft != 0))
{ {
if (valueCount > 0) auto typeInst = typedValue.mType->ToTypeInstance();
retVal += " | "; BfType* dscrType = typeInst->GetDiscriminatorType();
retVal += StrFormat("%lld", bitsLeft); BfType* payloadType = typeInst->GetUnionInnerType();
int dscrOffset = BF_ALIGN(payloadType->mSize, dscrType->mAlign);
int dscrVal = 0;
memcpy(&dscrVal, data + dscrOffset, dscrType->mSize);
for (auto& fieldInstance : typeInst->mFieldInstances)
{
auto fieldDef = fieldInstance.GetFieldDef();
if (!fieldInstance.mIsEnumPayloadCase)
continue;
int tagId = -fieldInstance.mDataIdx - 1;
if (dscrVal == tagId)
{
auto evalResult = BfTypedValue(module->mBfIRBuilder->CreateConstAggCE(
module->mBfIRBuilder->MapType(fieldInstance.mResolvedType), (addr_ce)dataAddr), fieldInstance.mResolvedType, true);
String innerResult = TypedValueToString(evalResult, "", formatInfo, NULL);
int crPos = (int)innerResult.IndexOf('\n');
if (crPos != -1)
innerResult.RemoveToEnd(crPos);
retVal += ".";
retVal += fieldDef->mName;
retVal += innerResult;
retVal += "\n" + TypeToString(origTypedValue.mType, typeModKind);
retVal += "\n:canEdit";
retVal += "\n" + GetMemberList(fieldInstance.mResolvedType, addr, dataAddr, false);
return retVal;
}
}
} }
retVal += "\n" + TypeToString(origTypedValue.mType, typeModKind);
retVal += "\n:canEdit";
return retVal;
} }
if (typedValue.mType->IsTypedPrimitive()) if (typedValue.mType->IsTypedPrimitive())
@ -3737,6 +3783,23 @@ String CeDebugger::TypedValueToString(const BfTypedValue& origTypedValue, const
} }
else if ((!isNull) && (!isBadSrc)) else if ((!isNull) && (!isBadSrc))
{ {
if (memberListType->IsInstanceOf(mCompiler->mTypeTypeDef))
{
auto typeInst = memberListType->ToTypeInstance();
auto typeIdField = typeInst->mTypeDef->GetFieldByName("mTypeId");
if (typeIdField != NULL)
{
auto& fieldInstance = typeInst->mFieldInstances[typeIdField->mIdx];
int typeId = 0;
memcpy(&typeId, data + fieldInstance.mDataOffset, fieldInstance.mResolvedType->mSize);
auto typeType = mCompiler->mContext->FindTypeById(typeId);
if (typeType != NULL)
{
retVal += "\n[Type]\t" + module->TypeToString(typeType);
}
}
}
retVal += "\n" + GetMemberList(memberListType, addr, dataAddr, false); retVal += "\n" + GetMemberList(memberListType, addr, dataAddr, false);
} }