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

Cleanup, removed 's' marker from leaked objects

Browse source
This commit is contained in:
Brian Fiete 2019-09-19 06:35:34 -07:00
parent d0de2cca64
commit d21954bac9
1 changed files with 6 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

56
IDEHelper/WinDebugger.cpp
View file

@ -6413,21 +6413,6 @@ String WinDebugger::DbgTypedValueToString(const DbgTypedValue& origTypedValue, c
DbgType* origValueType = typedValue.mType; DbgType* origValueType = typedValue.mType;
bool origHadRef = false; bool origHadRef = false;
DbgType* dwValueType = typedValue.mType->RemoveModifiers(&origHadRef); DbgType* dwValueType = typedValue.mType->RemoveModifiers(&origHadRef);
// if (origValueType->mTypeCode == DbgType_Bitfield)
// {
// auto dbgBitfieldType = (DbgBitfieldType*)origValueType;
//
// typedValue.mUInt64 = typedValue.mUInt64 >> dbgBitfieldType->mPosition;
//
// uint64 mask = ((uint64)1<<dbgBitfieldType->mLength) - 1;
// typedValue.mUInt64 &= mask;
//
// if ((dwValueType->IsSigned()) && ((typedValue.mUInt64 & (1LL << (dbgBitfieldType->mLength - 1))) != 0))
// {
// // Sign extend
// typedValue.mUInt64 |= ~mask;
// }
// }
if (dwValueType == NULL) if (dwValueType == NULL)
dwValueType = dbgModule->GetPrimitiveType(DbgType_Void, language); dwValueType = dbgModule->GetPrimitiveType(DbgType_Void, language);
@ -6502,18 +6487,6 @@ String WinDebugger::DbgTypedValueToString(const DbgTypedValue& origTypedValue, c
retVal += dwValueType->mTypeParam->ToString(language); retVal += dwValueType->mTypeParam->ToString(language);
retVal += StrFormat("[%d] ", formatInfo.mArrayLength); retVal += StrFormat("[%d] ", formatInfo.mArrayLength);
} }
else
{
// Show first item
// String evalString = "*((" + typedValue.mType->ToStringRaw(language) + ")" + EncodeDataPtr(ptrVal, true) + "), nm";
// DwFormatInfo emptyFormatInfo;
// DbgTypedValue evalResult = EvaluateInContext(dbgModule, typedValue, evalString, &emptyFormatInfo);
// if (evalResult)
// {
// retVal += DbgTypedValueToString(evalResult, evalString, emptyFormatInfo, NULL);
// }
}
_ShowArraySummary(retVal, ptrVal, formatInfo.mArrayLength, dwValueType->mTypeParam); _ShowArraySummary(retVal, ptrVal, formatInfo.mArrayLength, dwValueType->mTypeParam);
@ -7157,7 +7130,6 @@ String WinDebugger::DbgTypedValueToString(const DbgTypedValue& origTypedValue, c
String evalStr; String evalStr;
// Why did we have the "na"? Do we not want to show addresses for all members? // Why did we have the "na"? Do we not want to show addresses for all members?
//evalStr = "((" + innerType->ToStringRaw(language) + "*)" + EncodeDataPtr(ptrVal, true) + ")[{0}], na, refid=" + referenceId + ".[]";
evalStr = "((" + innerType->ToStringRaw(language) + "*)" + EncodeDataPtr(ptrVal, true) + ")[{0}], refid=" + MaybeQuoteFormatInfoParam(referenceId + ".[]"); evalStr = "((" + innerType->ToStringRaw(language) + "*)" + EncodeDataPtr(ptrVal, true) + ")[{0}], refid=" + MaybeQuoteFormatInfoParam(referenceId + ".[]");
if (typedValue.mIsReadOnly) if (typedValue.mIsReadOnly)
evalStr += ", ne"; evalStr += ", ne";
@ -7376,12 +7348,11 @@ String WinDebugger::DbgTypedValueToString(const DbgTypedValue& origTypedValue, c
{ {
bfObjectFlags = ((int)classVDataPtr) & 0xFF; bfObjectFlags = ((int)classVDataPtr) & 0xFF;
//TODO: Only do this in debug? if ((bfObjectFlags & BfObjectFlag_Deleted) != 0)
if (bfObjectFlags & BfObjectFlag_Deleted)
isDeletedBfObject = true; isDeletedBfObject = true;
if (bfObjectFlags & BfObjectFlag_AppendAlloc) if ((bfObjectFlags & BfObjectFlag_AppendAlloc) != 0)
isAppendBfObject = true; isAppendBfObject = true;
if (bfObjectFlags & BfObjectFlag_StackAlloc) if ((bfObjectFlags & (BfObjectFlag_StackAlloc | BfObjectFlag_Allocated)) == BfObjectFlag_StackAlloc)
isStackBfObject = true; isStackBfObject = true;
classVDataPtr &= ~0xFF; classVDataPtr &= ~0xFF;
@ -7440,11 +7411,6 @@ String WinDebugger::DbgTypedValueToString(const DbgTypedValue& origTypedValue, c
} }
} }
// if (className.StartsWith("bf."))
// className.Remove(0, 3);
// else if (className.StartsWith("Box<bf."))
// className.Remove(4, 3);
int lastDot = (int)className.LastIndexOf('.'); int lastDot = (int)className.LastIndexOf('.');
if (lastDot > 0) if (lastDot > 0)
className = className.Substring(0, lastDot); className = className.Substring(0, lastDot);
@ -7625,19 +7591,6 @@ String WinDebugger::DbgTypedValueToString(const DbgTypedValue& origTypedValue, c
if (language == DbgLanguage_Beef) if (language == DbgLanguage_Beef)
dwUseType->FixName(); dwUseType->FixName();
debugVis = FindVisualizerForType(dwUseType, &dbgVisWildcardCaptures); debugVis = FindVisualizerForType(dwUseType, &dbgVisWildcardCaptures);
// for (auto& wildcardCapture : dbgVisWildcardCaptures)
// {
// if (wildcardCapture.StartsWith("`"))
// {
// dwUseType->PopulateType();
// auto entry = dbgModule->mTypeMap.Find(wildcardCapture.c_str(), language);
// if (entry != NULL)
// {
// //wildcardCapture = entry->mValue->ToStringRaw(language);
// }
// }
// }
} }
bool hadCustomDisplayString = false; bool hadCustomDisplayString = false;
@ -10170,9 +10123,6 @@ String WinDebugger::GetThreadInfo()
if (stackIdx == 128) if (stackIdx == 128)
break; // Too many! break; // Too many!
// if ((ToLower(module->mDisplayName) != "ntdll.dll") && (ToLower(module->mDisplayName) != "kernel32.dll") && (ToLower(module->mDisplayName) != "kernelbase.dll"))
// break;
addr_target returnAddr; addr_target returnAddr;
if (!mDebugTarget->RollBackStackFrame(&registers, &returnAddr, true)) if (!mDebugTarget->RollBackStackFrame(&registers, &returnAddr, true))
{ {