ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bugfixes for PPCDebugInterface::GetMemoryAddressFromInstruction 

FromChars cannot return a value prefixed with 0x.
Possible regex failures on rX, rY, rZ
This commit is contained in:
TryTwo 2023-10-29 22:54:45 -07:00
parent 60e3b4c093
commit 490e4b78a7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Debugger/PPCDebugInterface.cpp
View File

@ -444,7 +444,7 @@ std::string PPCDebugInterface::GetDescription(u32 address) const
std::optional<u32> std::optional<u32>
PPCDebugInterface::GetMemoryAddressFromInstruction(const std::string& instruction) const PPCDebugInterface::GetMemoryAddressFromInstruction(const std::string& instruction) const
{ {
static const std::regex re(",[^r0-]*(-?)(0[xX]?[0-9a-fA-F]*|r\\d+)[^r^s]*.(p|toc|\\d+)"); static const std::regex re(",[^r0-]*(-?)(?:0[xX])?([0-9a-fA-F]+|r\\d+)[^r^s]*.(p|toc|\\d+)");
std::smatch match; std::smatch match;
// Instructions should be identified as a load or store before using this function. This error // Instructions should be identified as a load or store before using this function. This error