ARMv7: ARM encoding introduced; bugfixes

Utilities/GNU.h

@@ -14,6 +14,12 @@
 #define __noinline __attribute__((noinline))
 #endif
 
+#ifdef _WIN32
+#define __safebuffers __declspec(safebuffers)
+#else
+#define __safebuffers
+#endif
+
 template<size_t size>
 void strcpy_trunc(char(&dst)[size], const std::string& src)
 {

Utilities/Log.h

@@ -132,5 +132,5 @@ void log_message(Log::LogType type, Log::LogSeverity sev, std::string text);
 template<typename... Targs> 
 __noinline void log_message(Log::LogType type, Log::LogSeverity sev, const char* fmt, Targs... args)
 {
-	log_message(type, sev, fmt::detail::format(fmt, strlen(fmt), fmt::do_unveil(args)...));
+	log_message(type, sev, fmt::detail::format(fmt, fmt::do_unveil(args)...));
 }

Utilities/StrFmt.cpp

@@ -144,8 +144,9 @@ size_t fmt::detail::get_fmt_precision(const char* fmt, size_t len)
 	return 1;
 }
 
-std::string fmt::detail::format(const char* fmt, size_t len)
+std::string fmt::detail::format(const char* fmt)
 {
+	const size_t len = strlen(fmt);
 	const size_t fmt_start = get_fmt_start(fmt, len);
 	if (fmt_start != len)
 	{

Utilities/StrFmt.h

@@ -429,16 +429,17 @@ namespace fmt
 			}
 		};
 
-		std::string format(const char* fmt, size_t len); // terminator
+		std::string format(const char* fmt); // terminator
 
 		template<typename T, typename... Args>
-		std::string format(const char* fmt, size_t len, const T& arg, Args... args)
+		std::string format(const char* fmt, const T& arg, Args... args)
 		{
+			const size_t len = strlen(fmt);
 			const size_t fmt_start = get_fmt_start(fmt, len);
 			const size_t fmt_len = get_fmt_len(fmt + fmt_start, len - fmt_start);
 			const size_t fmt_end = fmt_start + fmt_len;
 
-			return std::string(fmt, fmt_start) + get_fmt<T>::text(fmt + fmt_start, fmt_len, arg) + format(fmt + fmt_end, len - fmt_end, args...);
+			return std::string(fmt, fmt_start) + get_fmt<T>::text(fmt + fmt_start, fmt_len, arg) + format(fmt + fmt_end, args...);
 		}
 	};
 
@@ -551,9 +552,9 @@ namespace fmt
 	Other features are not supported.
 	*/
 	template<typename... Args>
-	__forceinline std::string format(const char* fmt, Args... args)
+	__forceinline __safebuffers std::string format(const char* fmt, Args... args)
 	{
-		return detail::format(fmt, strlen(fmt), do_unveil(args)...);
+		return detail::format(fmt, do_unveil(args)...);
 	}
 
 	//convert a wxString to a std::string encoded in utf8