From 439bdde84932e02eecc43e6d986568f0e1a283b2 Mon Sep 17 00:00:00 2001
From: kd-11 <karokidii@gmail.com>
Date: Sat, 7 Jan 2023 22:51:02 +0300
Subject: [PATCH] rsx: Fix printing of expected values

---
 Utilities/StrFmt.h                | 23 ++++++++++++++++++++
 rpcs3/Emu/RSX/Common/expected.hpp | 36 +++++++++++++++++++++++++++++++
 rpcs3/Emu/RSX/rsx_decode.h        |  6 +++---
 rpcs3/emucore.vcxproj             |  1 +
 rpcs3/emucore.vcxproj.filters     |  3 +++
 5 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h
index 702375717c..5acb3a20eb 100644
--- a/Utilities/StrFmt.h
+++ b/Utilities/StrFmt.h
@@ -237,6 +237,29 @@ struct fmt_class_string<wchar_t*, void> : fmt_class_string<const wchar_t*>
 {
 };
 
+namespace fmt
+{
+	template <typename T>
+	concept StringConvertible = requires (T & t)
+	{
+		{ t.to_string() } -> std::convertible_to<std::string>;
+	};
+}
+
+template <fmt::StringConvertible T>
+struct fmt_class_string<T, void>
+{
+	static FORCE_INLINE SAFE_BUFFERS(const T&) get_object(u64 arg)
+	{
+		return *reinterpret_cast<const T*>(static_cast<uptr>(arg));
+	}
+
+	static void format(std::string& out, u64 arg)
+	{
+		out += get_object(arg).to_string();
+	}
+};
+
 namespace fmt
 {
 	// Both uchar and std::byte are allowed
diff --git a/rpcs3/Emu/RSX/Common/expected.hpp b/rpcs3/Emu/RSX/Common/expected.hpp
index f2735210ff..0a8e53ae7e 100644
--- a/rpcs3/Emu/RSX/Common/expected.hpp
+++ b/rpcs3/Emu/RSX/Common/expected.hpp
@@ -3,6 +3,12 @@
 #include <concepts>
 #include <utility>
 
+namespace fmt
+{
+	template <typename CharT, usz N, typename... Args>
+	static std::string format(const CharT(&)[N], const Args&...);
+}
+
 namespace rsx
 {
 	namespace exception_utils
@@ -26,6 +32,21 @@ namespace rsx
 			{
 				return error == soft_exception_error_code::none;
 			}
+
+			std::string to_string() const
+			{
+				switch (error)
+				{
+				case soft_exception_error_code::none:
+					return "No error";
+				case soft_exception_error_code::range_exception:
+					return "Bad Range";
+				case soft_exception_error_code::invalid_enum:
+					return "Invalid enum";
+				default:
+					return "Unknown Error";
+				}
+			}
 		};
 	}
 
@@ -79,5 +100,20 @@ namespace rsx
         {
             return error.empty() && value == other;
         }
+
+		std::string to_string() const
+		{
+			if (error.empty())
+			{
+				return fmt::format("%s", value);
+			}
+
+			if constexpr (std::is_same_v<E, exception_utils::soft_exception_t>)
+			{
+				return error.to_string();
+			}
+
+			return fmt::format("%s", error);
+		}
     };
 }
diff --git a/rpcs3/Emu/RSX/rsx_decode.h b/rpcs3/Emu/RSX/rsx_decode.h
index ece8785bd7..c041ae4161 100644
--- a/rpcs3/Emu/RSX/rsx_decode.h
+++ b/rpcs3/Emu/RSX/rsx_decode.h
@@ -2820,7 +2820,7 @@ struct registers_decoder<NV3089_SET_COLOR_FORMAT>
 
 	static std::string dump(const decoded_type& decoded)
 	{
-		return fmt::format("NV3089: source fmt: %s", *decoded.transfer_source_fmt());
+		return fmt::format("NV3089: source fmt: %s", decoded.transfer_source_fmt());
 	}
 };
 
@@ -2866,7 +2866,7 @@ struct registers_decoder<NV3062_SET_COLOR_FORMAT>
 
 	static std::string dump(const decoded_type& decoded)
 	{
-		return fmt::format("NV3062: output fmt: %s", *decoded.transfer_dest_fmt());
+		return fmt::format("NV3062: output fmt: %s", decoded.transfer_dest_fmt());
 	}
 };
 
@@ -3759,7 +3759,7 @@ struct registers_decoder<NV309E_SET_FORMAT>
 
 	static std::string dump(const decoded_type& decoded)
 	{
-		return fmt::format("NV309E: output fmt: %s log2-width: %u log2-height: %u", *decoded.format(),
+		return fmt::format("NV309E: output fmt: %s log2-width: %u log2-height: %u", decoded.format(),
 			decoded.sw_width_log2(), decoded.sw_height_log2());
 	}
 };
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 9ff45e96e5..4bcc6ab645 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -520,6 +520,7 @@
     <ClInclude Include="Emu\perf_monitor.hpp" />
     <ClInclude Include="Emu\RSX\Common\bitfield.hpp" />
     <ClInclude Include="Emu\RSX\Common\buffer_stream.hpp" />
+    <ClInclude Include="Emu\RSX\Common\expected.hpp" />
     <ClInclude Include="Emu\RSX\Common\profiling_timer.hpp" />
     <ClInclude Include="Emu\RSX\Common\ranged_map.hpp" />
     <ClInclude Include="Emu\RSX\Common\simple_array.hpp" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 6002b65491..900040a7b8 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -2227,6 +2227,9 @@
     <ClInclude Include="Emu\RSX\Core\RSXEngLock.hpp">
       <Filter>Emu\GPU\RSX\Core</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\Common\expected.hpp">
+      <Filter>Emu\GPU\RSX\Common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="Emu\RSX\Program\GLSLSnippets\GPUDeswizzle.glsl">