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

Watch lock fixes, add watch pointee/pointer address

Browse source
This commit is contained in:
Brian Fiete 2022-05-23 08:48:55 -07:00
parent d990e3afea
commit eccfabbad2
9 changed files with 214 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

38
IDEHelper/DbgExprEvaluator.cpp
View file

@ -970,10 +970,20 @@ DbgType* DbgExprEvaluator::ResolveTypeRef(BfTypeReference* typeRef)
String name = typeRef->ToString();
if (name.StartsWith("_T_"))
{
int idx = atoi(name.c_str() + 3);
if ((idx >= 0) && (idx < (int)mDbgModule->mTypes.size()))
return mDbgModule->mTypes[idx];
{
auto dbgModule = mDbgModule;
char* endPtr = NULL;
int typeIdx = strtol(name.c_str() + 3, &endPtr, 10);
if ((endPtr != NULL) && (*endPtr == '_'))
{
int moduleIdx = typeIdx;
typeIdx = atoi(endPtr + 1);
mDebugTarget->mDbgModuleMap.TryGetValue(moduleIdx, &dbgModule);
}
if ((dbgModule != NULL) && (typeIdx >= 0) && (typeIdx < (int)dbgModule->mTypes.size()))
return dbgModule->mTypes[typeIdx];
}
auto entry = mDbgModule->mTypeMap.Find(name.c_str(), GetLanguage());
@ -1023,23 +1033,33 @@ DbgType* DbgExprEvaluator::ResolveTypeRef(BfAstNode* typeRef, BfAstNode** parent
for (int i = 3; i < (int)name.length(); i++)
{
char c = name[i];
if ((c < '0') || (c > '9'))
if (((c < '0') || (c > '9')) && (c != '_'))
{
endIdx = i;
break;
}
}
int idx = atoi(name.c_str() + 3);
if ((idx >= 0) && (idx < (int)mDbgModule->mTypes.size()))
auto dbgModule = mDbgModule;
char* endPtr = NULL;
int typeIdx = strtol(name.c_str() + 3, &endPtr, 10);
if ((endPtr != NULL) && (*endPtr == '_'))
{
int moduleIdx = typeIdx;
typeIdx = atoi(endPtr + 1);
mDebugTarget->mDbgModuleMap.TryGetValue(moduleIdx, &dbgModule);
}
if ((dbgModule != NULL) && (typeIdx >= 0) && (typeIdx < (int)dbgModule->mTypes.size()))
{
if ((mExplicitThisExpr != NULL) && (parentChildRef != NULL))
mDeferredInsertExplicitThisVector.push_back(NodeReplaceRecord(typeRef, parentChildRef, true));
DbgType* dbgType = mDbgModule->mTypes[idx];
DbgType* dbgType = dbgModule->mTypes[typeIdx];
for (int i = endIdx; i < (int)name.length(); i++)
{
if (name[i] == '*')
dbgType = mDbgModule->GetPointerType(dbgType);
dbgType = dbgModule->GetPointerType(dbgType);
}
return dbgType;
}