dahjah/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2026-07-09 17:14:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

debugger: fix memory issues caused by overlayed debug symbols

Browse Source
This commit is contained in:
Crementif 2026-05-16 15:34:47 +02:00
parent 4013302f6f
commit ee3dffe59d
4 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Cafe/GraphicPack/GraphicPack2PatchesApply.cpp
View File

@ -420,7 +420,7 @@ void PatchEntryInstruction::undoPatch()
uint8* patchAddr = (uint8*)memory_base + addr; uint8* patchAddr = (uint8*)memory_base + addr;
memcpy(patchAddr, m_dataBackup, m_length); memcpy(patchAddr, m_dataBackup, m_length);
PPCRecompiler_invalidateRange(addr, addr + m_length); PPCRecompiler_invalidateRange(addr, addr + m_length);
rplSymbolStorage_removeRange(addr, m_length); rplSymbolStorage_removeRange(addr, m_length, RPL_STORED_SYMBOL_PATCH);
DebugSymbolStorage::ClearRange(addr, m_length); DebugSymbolStorage::ClearRange(addr, m_length);
} }
@ -434,7 +434,7 @@ bool registerU32Variable(PatchContext_t& ctx, std::string& name, uint32 value, P
} }
ctx.map_values[name] = value; ctx.map_values[name] = value;
// keep track of address symbols for the debugger // keep track of address symbols for the debugger
rplSymbolStorage_store(ctx.graphicPack->GetName().data(), name.data(), value); rplSymbolStorage_store(ctx.graphicPack->GetName().data(), name.data(), value, RPL_STORED_SYMBOL_PATCH);
return true; return true;
} }

40
src/Cafe/OS/RPL/rpl_symbol_storage.cpp
View File

@ -63,7 +63,7 @@ char* rplSymbolStorage_storeLibname(const char* libName)
return libEntry->libName; return libEntry->libName;
} }
RPLStoredSymbol* rplSymbolStorage_store(const char* libName, const char* symbolName, MPTR address) RPLStoredSymbol* rplSymbolStorage_store(const char* libName, const char* symbolName, MPTR address, uint32 type)
{ {
std::unique_lock<std::mutex> lck(rplSymbolStorage.m_symbolStorageMutex); std::unique_lock<std::mutex> lck(rplSymbolStorage.m_symbolStorageMutex);
char* libNameStorage = rplSymbolStorage_storeLibname(libName); char* libNameStorage = rplSymbolStorage_storeLibname(libName);
@ -72,7 +72,7 @@ RPLStoredSymbol* rplSymbolStorage_store(const char* libName, const char* symbolN
storedSymbol->address = address; storedSymbol->address = address;
storedSymbol->libName = libNameStorage; storedSymbol->libName = libNameStorage;
storedSymbol->symbolName = symbolNameStorage; storedSymbol->symbolName = symbolNameStorage;
storedSymbol->flags = 0; storedSymbol->flags = type;
storedSymbol->previous = nullptr; storedSymbol->previous = nullptr;
auto it = rplSymbolStorage.map_symbolByAddress.find(address); auto it = rplSymbolStorage.map_symbolByAddress.find(address);
if (it != rplSymbolStorage.map_symbolByAddress.end()) if (it != rplSymbolStorage.map_symbolByAddress.end())
@ -130,13 +130,41 @@ void rplSymbolStorage_remove(RPLStoredSymbol* storedSymbol)
delete storedSymbol; delete storedSymbol;
} }
void rplSymbolStorage_removeRange(MPTR address, sint32 length)
void rplSymbolStorage_removeRange(MPTR address, sint32 length, uint32 type)
{ {
std::unique_lock<std::mutex> lck(rplSymbolStorage.m_symbolStorageMutex);
while (length > 0) while (length > 0)
{ {
RPLStoredSymbol* symbol = rplSymbolStorage_getByAddress(address); auto it = rplSymbolStorage.map_symbolByAddress.find(address);
if (symbol) if (it != rplSymbolStorage.map_symbolByAddress.end())
rplSymbolStorage_remove(symbol); {
RPLStoredSymbol* current = it->second;
RPLStoredSymbol* newHead = current;
RPLStoredSymbol* previousKept = nullptr;
while (current)
{
RPLStoredSymbol* next = current->previous;
if ((current->flags & type) == type)
{
if (previousKept)
previousKept->previous = next;
else
newHead = next;
delete current;
}
else
{
previousKept = current;
}
current = next;
}
if (newHead)
it->second = newHead;
else
rplSymbolStorage.map_symbolByAddress.erase(it);
}
address += 4; address += 4;
length -= 4; length -= 4;
} }

11
src/Cafe/OS/RPL/rpl_symbol_storage.h
View File

@ -1,3 +1,10 @@
enum RPLStoredSymbolType : uint32
{
RPL_STORED_SYMBOL_NONE = 0,
RPL_STORED_SYMBOL_MAP = 1 << 0,
RPL_STORED_SYMBOL_PATCH = 1 << 1,
};
struct RPLStoredSymbol struct RPLStoredSymbol
{ {
MPTR address; MPTR address;
@ -9,9 +16,9 @@ struct RPLStoredSymbol
void rplSymbolStorage_init(); void rplSymbolStorage_init();
void rplSymbolStorage_unloadAll(); void rplSymbolStorage_unloadAll();
RPLStoredSymbol* rplSymbolStorage_store(const char* libName, const char* symbolName, MPTR address); RPLStoredSymbol* rplSymbolStorage_store(const char* libName, const char* symbolName, MPTR address, uint32 type = RPL_STORED_SYMBOL_NONE);
void rplSymbolStorage_remove(RPLStoredSymbol* storedSymbol); void rplSymbolStorage_remove(RPLStoredSymbol* storedSymbol);
void rplSymbolStorage_removeRange(MPTR address, sint32 length); void rplSymbolStorage_removeRange(MPTR address, sint32 length, uint32 type = RPL_STORED_SYMBOL_NONE);
RPLStoredSymbol* rplSymbolStorage_getByAddress(MPTR address); RPLStoredSymbol* rplSymbolStorage_getByAddress(MPTR address);
RPLStoredSymbol* rplSymbolStorage_getByClosestAddress(MPTR address); RPLStoredSymbol* rplSymbolStorage_getByClosestAddress(MPTR address);
void rplSymbolStorage_createJumpProxySymbol(MPTR jumpAddress, MPTR destAddress); void rplSymbolStorage_createJumpProxySymbol(MPTR jumpAddress, MPTR destAddress);

2
src/gui/wxgui/debugger/DebuggerWindow2.cpp
View File

@ -401,7 +401,7 @@ void DebuggerWindow2::LoadModuleMap(DebuggerModuleStorage& moduleStorage)
const auto relocatedAddress = GetRelocatedMapAddress(moduleStorage.moduleInfo, mapAddress); const auto relocatedAddress = GetRelocatedMapAddress(moduleStorage.moduleInfo, mapAddress);
if (relocatedAddress) if (relocatedAddress)
{ {
moduleStorage.loaded_map_symbols.emplace_back(rplSymbolStorage_store(moduleStorage.moduleInfo.moduleName.c_str(), symbolName.c_str(), *relocatedAddress)); moduleStorage.loaded_map_symbols.emplace_back(rplSymbolStorage_store(moduleStorage.moduleInfo.moduleName.c_str(), symbolName.c_str(), *relocatedAddress, RPL_STORED_SYMBOL_MAP));
} }
} }
} }