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

Added support for LF_CLASS_EX, LF_STRUCTURE_EX

Browse source
This commit is contained in:
Brian Fiete 2020-11-18 09:15:28 -08:00
parent 506d9868fa
commit 62611713b7
1 changed files with 72 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

79
IDEHelper/COFF.cpp
View file

@ -17,6 +17,10 @@
#include "BeefySysLib/util/AllocDebug.h" #include "BeefySysLib/util/AllocDebug.h"
#define LF_CLASS_EX 0x1608
#define LF_STRUCTURE_EX 0x1609
USING_NS_BF_DBG; USING_NS_BF_DBG;
#define MSF_SIGNATURE_700 "Microsoft C/C++ MSF 7.00\r\n\032DS\0\0" #define MSF_SIGNATURE_700 "Microsoft C/C++ MSF 7.00\r\n\032DS\0\0"
@ -1459,15 +1463,46 @@ DbgType* COFF::CvParseType(int tagIdx, bool ipi)
dbgType->mPriority = DbgTypePriority_Unique; dbgType->mPriority = DbgTypePriority_Unique;
} }
break; break;
case LF_STRUCTURE:
case LF_CLASS: case LF_CLASS:
case LF_STRUCTURE:
case LF_CLASS_EX:
case LF_STRUCTURE_EX:
{ {
lfClass& classInfo = *(lfClass*)dataStart; unsigned short count; // count of number of elements in class
data = (uint8*)&classInfo.data; CV_prop_t property; // property attribute field (prop_t)
int dataSize = (int)CvParseConstant(data); CV_typ_t field; // type index of LF_FIELD descriptor list
CV_typ_t derived; // type index of derived from list if not zero
CV_typ_t vshape; // type index of vshape table for this class
int dataSize;
int16 extra = 0;
if ((trLeafType == 0x1608) || (trLeafType == 0x1609))
{
property = GET(CV_prop_t);
extra = GET(int16);
field = GET(CV_typ_t);
derived = GET(CV_typ_t);
vshape = GET(CV_typ_t);
count = GET(unsigned short);
dataSize = (int)CvParseConstant(data);
}
else
{
count = GET(unsigned short);
property = GET(CV_prop_t);
field = GET(CV_typ_t);
derived = GET(CV_typ_t);
vshape = GET(CV_typ_t);
dataSize = (int)CvParseConstant(data);
}
const char* name = _ParseString(); const char* name = _ParseString();
// if (strstr(name, "TestStruct") != NULL)
// {
// NOP;
// }
// if ((strstr(name, "`") != NULL) || (strstr(name, "::__l") != NULL)) // if ((strstr(name, "`") != NULL) || (strstr(name, "::__l") != NULL))
// { // {
@ -1515,13 +1550,13 @@ DbgType* COFF::CvParseType(int tagIdx, bool ipi)
dbgType = CvCreateType(); dbgType = CvCreateType();
dbgType->mCompileUnit = mMasterCompileUnit; dbgType->mCompileUnit = mMasterCompileUnit;
dbgType->mIsDeclaration = classInfo.property.fwdref; dbgType->mIsDeclaration = property.fwdref;
if (isPartialDef) if (isPartialDef)
dbgType->mIsDeclaration = true; dbgType->mIsDeclaration = true;
dbgType->mName = name; dbgType->mName = name;
dbgType->mTypeName = name; dbgType->mTypeName = name;
//SplitName(dbgType->mName, dbgType->mTypeName, dbgType->mTemplateParams); //SplitName(dbgType->mName, dbgType->mTypeName, dbgType->mTemplateParams);
if (trLeafType == LF_CLASS) if ((trLeafType == LF_CLASS) || (trLeafType == LF_CLASS_EX))
dbgType->mTypeCode = DbgType_Class; dbgType->mTypeCode = DbgType_Class;
else else
dbgType->mTypeCode = DbgType_Struct; dbgType->mTypeCode = DbgType_Struct;
@ -1529,16 +1564,16 @@ DbgType* COFF::CvParseType(int tagIdx, bool ipi)
DbgType* baseType = NULL; DbgType* baseType = NULL;
if (classInfo.derived != 0) if (derived != 0)
{ {
baseType = CvGetTypeSafe(classInfo.derived); baseType = CvGetTypeSafe(derived);
BP_ALLOC_T(DbgBaseTypeEntry); BP_ALLOC_T(DbgBaseTypeEntry);
DbgBaseTypeEntry* baseTypeEntry = mAlloc.Alloc<DbgBaseTypeEntry>(); DbgBaseTypeEntry* baseTypeEntry = mAlloc.Alloc<DbgBaseTypeEntry>();
baseTypeEntry->mBaseType = baseType; baseTypeEntry->mBaseType = baseType;
dbgType->mBaseTypes.PushBack(baseTypeEntry); dbgType->mBaseTypes.PushBack(baseTypeEntry);
} }
if (classInfo.property.packed) if (property.packed)
{ {
dbgType->mAlign = 1; dbgType->mAlign = 1;
dbgType->mIsPacked = true; dbgType->mIsPacked = true;
@ -1558,9 +1593,9 @@ DbgType* COFF::CvParseType(int tagIdx, bool ipi)
} }
} }
if (classInfo.vshape != 0) if (vshape != 0)
{ {
CvGetTypeSafe(classInfo.vshape); CvGetTypeSafe(vshape);
dbgType->mHasVTable = true; dbgType->mHasVTable = true;
} }
@ -1751,6 +1786,12 @@ DbgType* COFF::CvParseType(int tagIdx, bool ipi)
} }
} }
break; break;
// case 0x1609:
// NOP;
// break;
default:
NOP;
break;
} }
if (dbgType != NULL) if (dbgType != NULL)
@ -1817,7 +1858,8 @@ void COFF::ParseTypeData(CvStreamReader& reader, int dataOffset)
if (trLeafType == 0) if (trLeafType == 0)
continue; continue;
if ((trLeafType == LF_ENUM) || (trLeafType == LF_CLASS) || (trLeafType == LF_STRUCTURE) || (trLeafType == LF_UNION)) if ((trLeafType == LF_ENUM) || (trLeafType == LF_CLASS) || (trLeafType == LF_STRUCTURE) || (trLeafType == LF_UNION) ||
(trLeafType == LF_CLASS_EX) || (trLeafType == LF_STRUCTURE_EX))
{ {
CvParseType(tagIdx); CvParseType(tagIdx);
} }
@ -4198,13 +4240,24 @@ void COFF::PopulateType(DbgType* dbgType)
CvParseMembers(dbgType, enumInfo.field, false); CvParseMembers(dbgType, enumInfo.field, false);
} }
break; break;
case LF_STRUCTURE:
case LF_CLASS: case LF_CLASS:
case LF_STRUCTURE:
{ {
lfClass& classInfo = *(lfClass*)dataStart; lfClass& classInfo = *(lfClass*)dataStart;
CvParseMembers(dbgType, classInfo.field, false); CvParseMembers(dbgType, classInfo.field, false);
} }
break; break;
case LF_CLASS_EX:
case LF_STRUCTURE_EX:
{
auto property = GET(CV_prop_t);
auto extra = GET(int16);
auto field = GET(CV_typ_t);
CvParseMembers(dbgType, field, false);
}
break;
case LF_UNION: case LF_UNION:
{ {
lfUnion& classInfo = *(lfUnion*)dataStart; lfUnion& classInfo = *(lfUnion*)dataStart;