mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-10 08:09:26 +01:00
Merge pull request #12261 from TryTwo/Bugfix_GetAddress
PPCDebugInterface: Tweak regex in GetMemoryAddressFromInstruction to fix bugs
This commit is contained in:
commit
03f8ec09eb
@ -444,7 +444,7 @@ std::string PPCDebugInterface::GetDescription(u32 address) const
|
||||
std::optional<u32>
|
||||
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;
|
||||
|
||||
// Instructions should be identified as a load or store before using this function. This error
|
||||
|
Loading…
x
Reference in New Issue
Block a user