Merge branch 'master' into patch-5

RPCS3 · Feb 4, 2020 · 25f8819 · 25f8819
2 parents e79f2b4 + 1a78e0e
commit 25f8819
Show file tree

Hide file tree

Showing 13 changed files with 141 additions and 109 deletions.
diff --git a/Utilities/Log.cpp b/Utilities/Log.cpp
@@ -420,9 +420,13 @@ logs::file_writer::file_writer(const std::string& name)
 		m_fout.open(log_name, fs::rewrite);
 
 		// Compressed log, make it inaccessible (foolproof)
-		if (!m_fout2.open(log_name + ".gz", fs::rewrite + fs::unread) || deflateInit2(&m_zs, 9, Z_DEFLATED, 16 + 15, 9, Z_DEFAULT_STRATEGY) != Z_OK)
+		if (m_fout2.open(log_name + ".gz", fs::rewrite + fs::unread))
 		{
-			m_fout2.close();
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+			if (deflateInit2(&m_zs, 9, Z_DEFLATED, 16 + 15, 9, Z_DEFAULT_STRATEGY) != Z_OK)
+#pragma GCC diagnostic pop
+				m_fout2.close();
 		}
 
 #ifdef _WIN32
@@ -666,14 +670,14 @@ void logs::file_listener::log(u64 stamp, const logs::message& msg, const std::st
 	// Used character: U+00B7 (Middle Dot)
 	switch (msg.sev)
 	{
-	case level::always:  text = u8"·A "; break;
-	case level::fatal:   text = u8"·F "; break;
-	case level::error:   text = u8"·E "; break;
-	case level::todo:    text = u8"·U "; break;
-	case level::success: text = u8"·S "; break;
-	case level::warning: text = u8"·W "; break;
-	case level::notice:  text = u8"·! "; break;
-	case level::trace:   text = u8"·T "; break;
+	case level::always:  text = reinterpret_cast<const char*>(u8"·A "); break;
+	case level::fatal:   text = reinterpret_cast<const char*>(u8"·F "); break;
+	case level::error:   text = reinterpret_cast<const char*>(u8"·E "); break;
+	case level::todo:    text = reinterpret_cast<const char*>(u8"·U "); break;
+	case level::success: text = reinterpret_cast<const char*>(u8"·S "); break;
+	case level::warning: text = reinterpret_cast<const char*>(u8"·W "); break;
+	case level::notice:  text = reinterpret_cast<const char*>(u8"·! "); break;
+	case level::trace:   text = reinterpret_cast<const char*>(u8"·T "); break;
 	}
 
 	// Print µs timestamp

diff --git a/Utilities/Log.h b/Utilities/Log.h
@@ -68,6 +68,13 @@ namespace logs
 		{
 		}
 
+	private:
+#if __cpp_char8_t >= 201811
+		using char2 = char8_t;
+#else
+		using char2 = uchar;
+#endif
+
 #define GEN_LOG_METHOD(_sev)\
 		const message msg_##_sev{this, level::_sev};\
 		template <std::size_t N, typename... Args>\
@@ -78,8 +85,18 @@ namespace logs
 				static constexpr fmt_type_info type_list[sizeof...(Args) + 1]{fmt_type_info::make<fmt_unveil_t<Args>>()...};\
 				msg_##_sev.broadcast(fmt, type_list, u64{fmt_unveil<Args>::get(args)}...);\
 			}\
-		}
+		}\
+		template <std::size_t N, typename... Args>\
+		void _sev(const char2(&fmt)[N], const Args&... args)\
+		{\
+			if (UNLIKELY(level::_sev <= enabled.load(std::memory_order_relaxed)))\
+			{\
+				static constexpr fmt_type_info type_list[sizeof...(Args) + 1]{fmt_type_info::make<fmt_unveil_t<Args>>()...};\
+				msg_##_sev.broadcast(reinterpret_cast<const char*>(+fmt), type_list, u64{fmt_unveil<Args>::get(args)}...);\
+			}\
+		}\
 
+	public:
 		GEN_LOG_METHOD(fatal)
 		GEN_LOG_METHOD(error)
 		GEN_LOG_METHOD(todo)

diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h
@@ -8,8 +8,8 @@
 
 namespace fmt
 {
-	template <typename... Args>
-	static std::string format(const char*, const Args&...);
+	template <typename CharT, std::size_t N, typename... Args>
+	static std::string format(const CharT(&)[N], const Args&...);
 }
 
 template <typename T, typename>
@@ -274,19 +274,19 @@ namespace fmt
 	void raw_append(std::string& out, const char*, const fmt_type_info*, const u64*) noexcept;
 
 	// Formatting function
-	template <typename... Args>
-	SAFE_BUFFERS FORCE_INLINE void append(std::string& out, const char* fmt, const Args&... args)
+	template <typename CharT, std::size_t N, typename... Args>
+	SAFE_BUFFERS FORCE_INLINE void append(std::string& out, const CharT(&fmt)[N], const Args&... args)
 	{
 		static constexpr fmt_type_info type_list[sizeof...(Args) + 1]{fmt_type_info::make<fmt_unveil_t<Args>>()...};
-		raw_append(out, fmt, type_list, fmt_args_t<Args...>{fmt_unveil<Args>::get(args)...});
+		raw_append(out, reinterpret_cast<const char*>(fmt), type_list, fmt_args_t<Args...>{fmt_unveil<Args>::get(args)...});
 	}
 
 	// Formatting function
-	template <typename... Args>
-	SAFE_BUFFERS FORCE_INLINE std::string format(const char* fmt, const Args&... args)
+	template <typename CharT, std::size_t N, typename... Args>
+	SAFE_BUFFERS FORCE_INLINE std::string format(const CharT(&fmt)[N], const Args&... args)
 	{
 		std::string result;
-		append<Args...>(result, fmt, args...);
+		append(result, fmt, args...);
 		return result;
 	}
 

diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp
@@ -2203,7 +2203,10 @@ void thread_ctrl::set_thread_affinity_mask(u64 mask)
 
 		if (shifted & 1)
 		{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
 			CPU_SET(core, &cs);
+#pragma GCC diagnostic pop
 		}
 
 		if (shifted <= 1)

diff --git a/rpcs3/Crypto/unself.cpp b/rpcs3/Crypto/unself.cpp
@@ -832,7 +832,10 @@ std::vector<fs::file> SCEDecrypter::MakeFile()
 			strm.avail_out = BUFSIZE;
 			strm.next_in = data_buf.get()+data_buf_offset;
 			strm.next_out = tempbuf;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
 			int ret = inflateInit(&strm);
+#pragma GCC diagnostic pop
 
 			while (strm.avail_in)
 			{

diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp
@@ -1159,32 +1159,32 @@ void fmt_class_string<vm::_ptr_base<const char, u32>>::format(std::string& out,
 	// Special case (may be allowed for some arguments)
 	if (arg == 0)
 	{
-		out += u8"«NULL»";
+		out += reinterpret_cast<const char*>(u8"«NULL»");
 		return;
 	}
 
 	// Filter certainly invalid addresses (TODO)
 	if (arg < 0x10000 || arg >= 0xf0000000)
 	{
-		out += u8"«INVALID_ADDRESS:";
+		out += reinterpret_cast<const char*>(u8"«INVALID_ADDRESS:");
 		fmt_class_string<u32>::format(out, arg);
-		out += u8"»";
+		out += reinterpret_cast<const char*>(u8"»");
 		return;
 	}
 
 	const auto start = out.size();
 
-	out += u8"“";
+	out += reinterpret_cast<const char*>(u8"“");
 
 	for (vm::_ptr_base<const volatile char, u32> ptr = vm::cast(arg);; ptr++)
 	{
 		if (!vm::check_addr(ptr.addr()))
 		{
 			// TODO: optimize checks
 			out.resize(start);
-			out += u8"«INVALID_ADDRESS:";
+			out += reinterpret_cast<const char*>(u8"«INVALID_ADDRESS:");
 			fmt_class_string<u32>::format(out, arg);
-			out += u8"»";
+			out += reinterpret_cast<const char*>(u8"»");
 			return;
 		}
 
@@ -1198,5 +1198,5 @@ void fmt_class_string<vm::_ptr_base<const char, u32>>::format(std::string& out,
 		}
 	}
 
-	out += u8"”";
+	out += reinterpret_cast<const char*>(u8"”");
 }
diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h
@@ -346,8 +346,8 @@ namespace rsx
 			m_cache_update_tag = rsx::get_shared_tag();
 		}
 
-		template <typename... Args>
-		void emit_once(bool error, const char* fmt, const Args&... params)
+		template <typename CharT, std::size_t N, typename... Args>
+		void emit_once(bool error, const CharT(&fmt)[N], const Args&... params)
 		{
 			const auto result = m_once_only_messages_set.emplace(fmt::format(fmt, params...));
 			if (!result.second)
@@ -359,14 +359,14 @@ namespace rsx
 				rsx_log.warning("%s", *result.first);
 		}
 
-		template <typename... Args>
-		void err_once(const char* fmt, const Args&... params)
+		template <typename CharT, std::size_t N, typename... Args>
+		void err_once(const CharT(&fmt)[N], const Args&... params)
 		{
 			emit_once(true, fmt, params...);
 		}
 
-		template <typename... Args>
-		void warn_once(const char* fmt, const Args&... params)
+		template <typename CharT, std::size_t N, typename... Args>
+		void warn_once(const CharT(&fmt)[N], const Args&... params)
 		{
 			emit_once(false, fmt, params...);
 		}

diff --git a/rpcs3/Emu/RSX/rsx_cache.h b/rpcs3/Emu/RSX/rsx_cache.h
@@ -427,8 +427,7 @@ namespace rsx
 
 		std::string get_message(u32 index, u32 processed, u32 entry_count)
 		{
-			const char* text = index == 0 ? "Loading pipeline object %u of %u" : "Compiling pipeline object %u of %u";
-			return fmt::format(text, processed, entry_count);
+			return fmt::format("%s pipeline object %u of %u", index == 0 ? "Loading" : "Compiling", processed, entry_count);
 		};
 
 		void load_shaders(uint nb_workers, unpacked_type& unpacked, std::string& directory_path, std::vector<fs::dir_entry>& entries, u32 entry_count,