Merge pull request #12261 from TryTwo/Bugfix_GetAddress

PPCDebugInterface: Tweak regex in GetMemoryAddressFromInstruction to fix bugs
dolphin-emu · Oct 30, 2023 · 03f8ec0 · 03f8ec0
2 parents 045868b + 490e4b7
commit 03f8ec0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Debugger/PPCDebugInterface.cpp
@@ -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