preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-04 03:35:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22149 from hrydgard/symbol-map-cache-fix

Browse Source 
ImDebugger: fix stale symbol list after a game is reloaded
This commit is contained in:
Henrik Rydgård
2026-08-27 20:19:03 +02:00
committed by GitHub
parent 518bc7a7fc daa18fc25a
commit 04bf3e56ef
7 changed files with 95 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/ImDebugger/ImDisasmView.cpp
+16 -4
View File
@@ -1323,18 +1323,30 @@ void ImDisasmWindow::Draw(MIPSDebugInterface *mipsDebug, ImConfig &cfg, ImContro
avail.y -= ImGui::GetTextLineHeightWithSpacing();
if (ImGui::BeginChild("left", ImVec2(150.0f, avail.y), ImGuiChildFlags_ResizeX)) {
if (symCache_.empty() || symsDirty_) {
if (symCacheVersion_ != g_symbolMap->Version()) {
// The index into symCache_ means something different after a rebuild, and nothing at
// all if the map was replaced (which is what happens when a game exits), so re-find
// the selection by address instead of carrying the index over.
const u32 selectedAddr = (selectedSymbol_ >= 0 && selectedSymbol_ < (int)symCache_.size()) ? symCache_[selectedSymbol_].address : (u32)INVALID_ADDR;
symCache_ = g_symbolMap->GetAllActiveSymbols(SymbolType::ST_FUNCTION);
symsDirty_ = false;
symCacheVersion_ = g_symbolMap->Version();
symMatchesDirty_ = true;
selectedSymbol_ = -1;
if (selectedAddr != INVALID_ADDR) {
for (int i = 0; i < (int)symCache_.size(); i++) {
if (symCache_[i].address == selectedAddr) {
selectedSymbol_ = i;
break;
}
}
}
}
if (selectedSymbol_ >= 0 && selectedSymbol_ < symCache_.size()) {
if (selectedSymbol_ >= 0 && selectedSymbol_ < (int)symCache_.size()) {
auto &sym = symCache_[selectedSymbol_];
if (ImGui::TreeNode("Edit Symbol", "Edit %s", sym.name.c_str())) {
if (ImGui::InputText("Name", selectedSymbolName_, sizeof(selectedSymbolName_), ImGuiInputTextFlags_EnterReturnsTrue)) {
g_symbolMap->SetLabelName(selectedSymbolName_, sym.address);
symsDirty_ = true;
}
ImGui::Text("%08x (size: %0d)", sym.address, sym.size);
ImGui::TreePop();