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

Fixed hot-swap mFindDbgModuleCache where addrs are not 64k-aligned

Browse source
This commit is contained in:
Brian Fiete 2023-07-25 07:42:37 -07:00
parent 8666fbe584
commit e2f45167f9
3 changed files with 55 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

45
IDEHelper/DebugTarget.cpp
View file

@ -46,6 +46,8 @@ DebugTarget::DebugTarget(WinDebugger* debugger)
DebugTarget::~DebugTarget() DebugTarget::~DebugTarget()
{ {
ClearFindDbgModuleCache();
for (auto dwarf : mDbgModules) for (auto dwarf : mDbgModules)
delete dwarf; delete dwarf;
@ -273,7 +275,7 @@ String DebugTarget::UnloadDyn(addr_target imageBase)
} }
} }
mFindDbgModuleCache.Clear(); ClearFindDbgModuleCache();
mDbgModules.RemoveAt(i); mDbgModules.RemoveAt(i);
bool success = mDbgModuleMap.Remove(dwarf->mId); bool success = mDbgModuleMap.Remove(dwarf->mId);
BF_ASSERT_REL(success); BF_ASSERT_REL(success);
@ -317,7 +319,7 @@ void DebugTarget::CleanupHotHeap()
DbgModule* dbgModule = mDbgModules[dwarfIdx]; DbgModule* dbgModule = mDbgModules[dwarfIdx];
if (dbgModule->mDeleting) if (dbgModule->mDeleting)
{ {
mFindDbgModuleCache.Clear(); ClearFindDbgModuleCache();
mDbgModules.RemoveAt(dwarfIdx); mDbgModules.RemoveAt(dwarfIdx);
bool success = mDbgModuleMap.Remove(dbgModule->mId); bool success = mDbgModuleMap.Remove(dbgModule->mId);
BF_ASSERT_REL(success); BF_ASSERT_REL(success);
@ -931,10 +933,19 @@ void DebugTarget::GetCompilerSettings()
} }
} }
void DebugTarget::ClearFindDbgModuleCache()
{
for (auto& entry : mFindDbgModuleCache)
{
delete entry.mValue.mCollisions;
}
mFindDbgModuleCache.Clear();
}
void DebugTarget::AddDbgModule(DbgModule* dbgModule) void DebugTarget::AddDbgModule(DbgModule* dbgModule)
{ {
dbgModule->mId = ++mCurModuleId; dbgModule->mId = ++mCurModuleId;
mFindDbgModuleCache.Clear(); ClearFindDbgModuleCache();
mDbgModules.Add(dbgModule); mDbgModules.Add(dbgModule);
bool success = mDbgModuleMap.TryAdd(dbgModule->mId, dbgModule); bool success = mDbgModuleMap.TryAdd(dbgModule->mId, dbgModule);
BF_ASSERT_REL(success); BF_ASSERT_REL(success);
@ -2481,17 +2492,39 @@ DbgBreakKind DebugTarget::GetDbgBreakKind(addr_target address, CPURegisters* reg
DbgModule* DebugTarget::FindDbgModuleForAddress(addr_target address) DbgModule* DebugTarget::FindDbgModuleForAddress(addr_target address)
{ {
addr_target checkAddr = address & ~0xFFFF; addr_target checkAddr = address & ~0xFFFF;
DbgModule** valuePtr = NULL; FindDbgModuleCacheEntry* valuePtr = NULL;
if (mFindDbgModuleCache.TryAdd(checkAddr, NULL, &valuePtr)) if (mFindDbgModuleCache.TryAdd(checkAddr, NULL, &valuePtr))
{ {
for (auto dwarf : mDbgModules) for (auto dwarf : mDbgModules)
{ {
if ((address >= dwarf->mImageBase) && (address < dwarf->mImageBase + dwarf->mImageSize)) if ((address >= dwarf->mImageBase) && (address < dwarf->mImageBase + dwarf->mImageSize))
*valuePtr = dwarf; {
if (valuePtr->mFirst == NULL)
{
valuePtr->mFirst = dwarf;
}
else
{
if (valuePtr->mCollisions == NULL)
valuePtr->mCollisions = new Array<DbgModule*>();
valuePtr->mCollisions->Add(dwarf);
}
}
} }
} }
return *valuePtr; auto dwarf = valuePtr->mFirst;
if ((address >= dwarf->mImageBase) && (address < dwarf->mImageBase + dwarf->mImageSize))
return dwarf;
if (valuePtr->mCollisions != NULL)
{
for (auto dwarf : *valuePtr->mCollisions)
if ((address >= dwarf->mImageBase) && (address < dwarf->mImageBase + dwarf->mImageSize))
return dwarf;
}
return NULL;
} }
DbgModule* DebugTarget::GetMainDbgModule() DbgModule* DebugTarget::GetMainDbgModule()

15
IDEHelper/DebugTarget.h
View file

@ -18,6 +18,18 @@ enum DbgOnDemandKind
DbgOnDemandKind_AllowRemote DbgOnDemandKind_AllowRemote
}; };
struct FindDbgModuleCacheEntry
{
DbgModule* mFirst;
Array<DbgModule*>* mCollisions;
FindDbgModuleCacheEntry()
{
mFirst = NULL;
mCollisions = NULL;
}
};
class DebugTarget class DebugTarget
{ {
public: public:
@ -42,7 +54,7 @@ public:
DbgModule* mTargetBinary; DbgModule* mTargetBinary;
Array<DbgModule*> mDbgModules; Array<DbgModule*> mDbgModules;
Dictionary<int, DbgModule*> mDbgModuleMap; Dictionary<int, DbgModule*> mDbgModuleMap;
Dictionary<addr_target, DbgModule*> mFindDbgModuleCache; // Addresses are all 64k multiples Dictionary<addr_target, FindDbgModuleCacheEntry> mFindDbgModuleCache; // Addresses are all 64k multiples
HashSet<DbgSrcFile*> mPendingSrcFileRehup; // Waiting to remove old/invalid line info HashSet<DbgSrcFile*> mPendingSrcFileRehup; // Waiting to remove old/invalid line info
BumpAllocator mAlloc; BumpAllocator mAlloc;
@ -78,6 +90,7 @@ public:
DebugTarget(WinDebugger* debugger); DebugTarget(WinDebugger* debugger);
~DebugTarget(); ~DebugTarget();
void ClearFindDbgModuleCache();
void AddDbgModule(DbgModule* dbgModule); void AddDbgModule(DbgModule* dbgModule);
DbgModule* Init(const StringImpl& launchPath, const StringImpl& targetPath, intptr imageBase = 0); DbgModule* Init(const StringImpl& launchPath, const StringImpl& targetPath, intptr imageBase = 0);
void SetupTargetBinary(); void SetupTargetBinary();

1
IDEHelper/Debugger.cpp
View file

@ -66,6 +66,7 @@ DbgMemoryFlags DbgModuleMemoryCache::Read(uintptr addr, uint8* data, int size)
if ((addr < mAddr) || (addr > mAddr + mSize)) if ((addr < mAddr) || (addr > mAddr + mSize))
{ {
if (data != NULL)
gDebugger->ReadMemory(addr, size, data); gDebugger->ReadMemory(addr, size, data);
flags = gDebugger->GetMemoryFlags(addr); flags = gDebugger->GetMemoryFlags(addr);
BfLogDbg("Got memory flags %p = %d\n", addr, flags); BfLogDbg("Got memory flags %p = %d\n", addr, flags);