Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

ImDebugger: fix stale symbol list after a game is reloaded

Browse Source 
The disasm window cached the flattened symbol list and only rebuilt it when one
of three menu items said so. Nothing marked it dirty when a game booted or
exited, and a new SymbolMap is allocated per boot, so the list kept showing the
previous game's functions.

Give SymbolMap a version counter that every mutator bumps, and let the window
compare against it instead. The counter is process-wide rather than per-map, so
a fresh map can't hand out a version a cached copy already holds.

Also re-find the selected symbol by address after a rebuild (the index means
something else afterwards), and drop the unused symbol cache members in
ImMemWindow.

Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_01SfY7iFJEjmRXf1XGrTs4MF
This commit is contained in:
Henrik RydgårdandClaude Opus 5 committed 2026-08-27 10:43:08 +02:00
1 parent adccd302e5
commit daa18fc25a
7 files changed
+95 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

unittest/UnitTest.cpp
+32
View File
@@ -1611,6 +1611,38 @@ bool TestSymbolMap() {
EXPECT_EQ_INT((int)map.GetFunctionStart(kModStart + 0x100), (int)SymbolMap::INVALID_ADDRESS);
}
// Version() is what the ImDebugger's symbol list uses to notice its cached copy went stale.
{
SymbolMap map;
const uint32_t v0 = map.Version();
map.AddModule("TEST", kModStart, kModSize);
const uint32_t v1 = map.Version();
EXPECT_TRUE(v0 != v1);
map.AddFunction("func", kModStart + 0x100, 0x40);
const uint32_t v2 = map.Version();
EXPECT_TRUE(v1 != v2);
map.SetLabelName("renamed", kModStart + 0x100);
const uint32_t v3 = map.Version();
EXPECT_TRUE(v2 != v3);
// Reads don't count as changes.
map.SortSymbols();
map.GetAllActiveSymbols(ST_FUNCTION);
EXPECT_EQ_INT((int)map.Version(), (int)v3);
map.UnloadModule(kModStart, kModSize);
EXPECT_TRUE(v3 != map.Version());
map.Clear();
EXPECT_TRUE(v3 != map.Version());
// The emulator throws the whole map away and builds a new one on every boot, so a fresh
// map must never hand out a version a previous one already used - otherwise a cache built
// from the last game's symbols looks current for the next game.
SymbolMap map2;
EXPECT_TRUE(map.Version() != map2.Version());
map2.AddModule("TEST", kModStart, kModSize);
map2.AddFunction("func", kModStart + 0x100, 0x40);
EXPECT_TRUE(map.Version() != map2.Version());
}
return true;
}