1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 19:48:20 +02:00

Fixed some @ var lookups

This commit is contained in:
Brian Fiete 2019-10-04 10:37:22 -07:00
parent e5de09488e
commit 570c03f25c

View file

@ -437,7 +437,7 @@ bool DebugTarget::GetValueByName(DbgSubprogram* subProgram, const StringImpl& na
BP_ZONE("DebugTarget::GetValueByName"); BP_ZONE("DebugTarget::GetValueByName");
//BF_ASSERT(*outAddrType == DbgAddrType_None); //BF_ASSERT(*outAddrType == DbgAddrType_None);
String checkName = name; String checkName = name;
if (subProgram != NULL) if (subProgram != NULL)
@ -2203,6 +2203,8 @@ addr_target DebugTarget::GetStaticAddress(DbgVariable* dwVariable)
bool DebugTarget::GetValueByNameInBlock_Helper(DbgSubprogram* dwSubprogram, DbgBlock* dwBlock, String& name, WdStackFrame* stackFrame, intptr* outAddr, DbgType** outType, DbgAddrType* outAddrType) bool DebugTarget::GetValueByNameInBlock_Helper(DbgSubprogram* dwSubprogram, DbgBlock* dwBlock, String& name, WdStackFrame* stackFrame, intptr* outAddr, DbgType** outType, DbgAddrType* outAddrType)
{ {
int nameLen = (int)name.length();
// Checks for previous version of a local name by stripping off the '@' each time we find a match, until we don't have any @'s left // Checks for previous version of a local name by stripping off the '@' each time we find a match, until we don't have any @'s left
auto _CheckName = [&](const char* localName) auto _CheckName = [&](const char* localName)
{ {
@ -2213,6 +2215,7 @@ bool DebugTarget::GetValueByNameInBlock_Helper(DbgSubprogram* dwSubprogram, DbgB
namePtr++; namePtr++;
if (strcmp(localName, namePtr) == 0) if (strcmp(localName, namePtr) == 0)
{ {
nameLen--;
name.Remove(0, 1); name.Remove(0, 1);
} }
}; };
@ -2260,8 +2263,7 @@ bool DebugTarget::GetValueByNameInBlock_Helper(DbgSubprogram* dwSubprogram, DbgB
*outType = dwSubprogram->mCompileUnit->mDbgModule->GetConstType(*outType); *outType = dwSubprogram->mCompileUnit->mDbgModule->GetConstType(*outType);
} }
}; };
int nameLen = (int)name.length();
//for (auto variable : dwBlock->mVariables) //for (auto variable : dwBlock->mVariables)
for (int varIdx = (int)checkVars.size() - 1; varIdx >= 0; varIdx--) for (int varIdx = (int)checkVars.size() - 1; varIdx >= 0; varIdx--)
{ {