Merge pull request #11920 from Minty-Meeo/kill-ascii-to-hex

Kill AsciiToHex

Source/Core/Common/NandPaths.cpp

@@ -90,7 +90,8 @@ bool IsTitlePath(const std::string& path, std::optional<FromWhichRoot> from, u64
   }
 
   u32 title_id_high, title_id_low;
-  if (!AsciiToHex(components[0], title_id_high) || !AsciiToHex(components[1], title_id_low))
+  if (Common::FromChars(components[0], title_id_high, 16).ec != std::errc{} ||
+      Common::FromChars(components[1], title_id_low, 16).ec != std::errc{})
   {
     return false;
   }
@@ -155,8 +156,11 @@ std::string UnescapeFileName(const std::string& filename)
   {
     u32 character;
     if (pos + 6 <= result.size() && result[pos + 4] == '_' && result[pos + 5] == '_')
-      if (AsciiToHex(result.substr(pos + 2, 2), character))
+      if (Common::FromChars(std::string_view{result}.substr(pos + 2, 2), character, 16).ec ==
+          std::errc{})
+      {
         result.replace(pos, 6, {static_cast<char>(character)});
+      }
 
     ++pos;
   }

Source/Core/Common/StringUtil.cpp

@@ -85,25 +85,6 @@ std::string HexDump(const u8* data, size_t size)
   return out;
 }
 
-// faster than sscanf
-bool AsciiToHex(const std::string& _szValue, u32& result)
-{
-  // Set errno to a good state.
-  errno = 0;
-
-  char* endptr = nullptr;
-  const u32 value = strtoul(_szValue.c_str(), &endptr, 16);
-
-  if (!endptr || *endptr)
-    return false;
-
-  if (errno == ERANGE)
-    return false;
-
-  result = value;
-  return true;
-}
-
 bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list args)
 {
   int writtenCount;

Source/Core/Common/StringUtil.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <charconv>
 #include <cstdarg>
 #include <cstddef>
 #include <cstdlib>
@@ -147,8 +148,24 @@ std::string ValueToString(T value)
 // Generates an hexdump-like representation of a binary data blob.
 std::string HexDump(const u8* data, size_t size);
 
-// TODO: kill this
+namespace Common
-bool AsciiToHex(const std::string& _szValue, u32& result);
+{
+template <typename T, typename std::enable_if_t<std::is_integral_v<T>>* = nullptr>
+std::from_chars_result FromChars(std::string_view sv, T& value, int base = 10)
+{
+  const char* const first = sv.data();
+  const char* const last = first + sv.size();
+  return std::from_chars(first, last, value, base);
+}
+template <typename T, typename std::enable_if_t<std::is_floating_point_v<T>>* = nullptr>
+std::from_chars_result FromChars(std::string_view sv, T& value,
+                                 std::chars_format fmt = std::chars_format::general)
+{
+  const char* const first = sv.data();
+  const char* const last = first + sv.size();
+  return std::from_chars(first, last, value, fmt);
+}
+};  // namespace Common
 
 std::string TabsToSpaces(int tab_size, std::string str);
 

Source/Core/Core/Debugger/PPCDebugInterface.cpp

@@ -14,6 +14,7 @@
 
 #include "Common/Align.h"
 #include "Common/GekkoDisassembler.h"
+#include "Common/StringUtil.h"
 
 #include "Core/Config/MainSettings.h"
 #include "Core/Core.h"
@@ -451,22 +452,23 @@ PPCDebugInterface::GetMemoryAddressFromInstruction(const std::string& instructio
   if (!std::regex_search(instruction, match, re))
     return std::nullopt;
 
-  // Output: match.str(1): negative sign for offset or no match. match.str(2): 0xNNNN, 0, or
+  // match[1]: negative sign for offset or no match.
-  // rNN. Check next for 'r' to see if a gpr needs to be loaded. match.str(3): will either be p,
+  // match[2]: 0xNNNN, 0, or rNN. Check next for 'r' to see if a gpr needs to be loaded.
-  // toc, or NN. Always a gpr.
+  // match[3]: will either be p, toc, or NN. Always a gpr.
-  const std::string offset_match = match.str(2);
+  const std::string_view offset_match{&*match[2].first, size_t(match[2].length())};
-  const std::string register_match = match.str(3);
+  const std::string_view register_match{&*match[3].first, size_t(match[3].length())};
   constexpr char is_reg = 'r';
   u32 offset = 0;
 
   if (is_reg == offset_match[0])
   {
-    const int register_index = std::stoi(offset_match.substr(1), nullptr, 10);
+    unsigned register_index;
+    Common::FromChars(offset_match.substr(1), register_index, 10);
     offset = (register_index == 0 ? 0 : m_system.GetPPCState().gpr[register_index]);
   }
   else
   {
-    offset = static_cast<u32>(std::stoi(offset_match, nullptr, 16));
+    Common::FromChars(offset_match, offset, 16);
   }
 
   // sp and rtoc need to be converted to 1 and 2.
@@ -479,11 +481,11 @@ PPCDebugInterface::GetMemoryAddressFromInstruction(const std::string& instructio
   else if (is_rtoc == register_match[0])
     i = 2;
   else
-    i = std::stoi(register_match, nullptr, 10);
+    Common::FromChars(register_match, i, 10);
 
   const u32 base_address = m_system.GetPPCState().gpr[i];
 
-  if (!match.str(1).empty())
+  if (std::string_view sign{&*match[1].first, size_t(match[1].length())}; !sign.empty())
     return base_address - offset;
 
   return base_address + offset;