Revert "Replace rotate utils with std::rotl" (partial)

This reverts commit 4d8bfe328b.

Utilities/asm.h

@@ -7,6 +7,94 @@ namespace utils
 // Rotate helpers
 #if defined(__GNUG__)
 
+	inline u8 rol8(u8 x, u8 n)
+	{
+#if __has_builtin(__builtin_rotateleft8)
+		return __builtin_rotateleft8(x, n);
+#else
+		u8 result = x;
+		__asm__("rolb %[n], %[result]" : [result] "+g"(result) : [n] "c"(n));
+		return result;
+#endif
+	}
+
+	inline u8 ror8(u8 x, u8 n)
+	{
+#if __has_builtin(__builtin_rotateright8)
+		return __builtin_rotateright8(x, n);
+#else
+		u8 result = x;
+		__asm__("rorb %[n], %[result]" : [result] "+g"(result) : [n] "c"(n));
+		return result;
+#endif
+	}
+
+	inline u16 rol16(u16 x, u16 n)
+	{
+#if __has_builtin(__builtin_rotateleft16)
+		return __builtin_rotateleft16(x, n);
+#else
+		u16 result = x;
+		__asm__("rolw %b[n], %[result]" : [result] "+g"(result) : [n] "c"(n));
+		return result;
+#endif
+	}
+
+	inline u16 ror16(u16 x, u16 n)
+	{
+#if __has_builtin(__builtin_rotateright16)
+		return __builtin_rotateright16(x, n);
+#else
+		u16 result = x;
+		__asm__("rorw %b[n], %[result]" : [result] "+g"(result) : [n] "c"(n));
+		return result;
+#endif
+	}
+
+	inline u32 rol32(u32 x, u32 n)
+	{
+#if __has_builtin(__builtin_rotateleft32)
+		return __builtin_rotateleft32(x, n);
+#else
+		u32 result = x;
+		__asm__("roll %b[n], %[result]" : [result] "+g"(result) : [n] "c"(n));
+		return result;
+#endif
+	}
+
+	inline u32 ror32(u32 x, u32 n)
+	{
+#if __has_builtin(__builtin_rotateright32)
+		return __builtin_rotateright32(x, n);
+#else
+		u32 result = x;
+		__asm__("rorl %b[n], %[result]" : [result] "+g"(result) : [n] "c"(n));
+		return result;
+#endif
+	}
+
+	inline u64 rol64(u64 x, u64 n)
+	{
+#if __has_builtin(__builtin_rotateleft64)
+		return __builtin_rotateleft64(x, n);
+#else
+		u64 result = x;
+		__asm__("rolq %b[n], %[result]" : [result] "+g"(result) : [n] "c"(n));
+		return result;
+#endif
+	}
+
+	inline u64 ror64(u64 x, u64 n)
+	{
+#if __has_builtin(__builtin_rotateright64)
+		return __builtin_rotateright64(x, n);
+#else
+		u64 result = x;
+		__asm__("rorq %b[n], %[result]" : [result] "+g"(result) : [n] "c"(n));
+		return result;
+#endif
+	}
+
 	constexpr u64 umulh64(u64 a, u64 b)
 	{
 		const __uint128_t x = a;
@@ -48,6 +136,45 @@ namespace utils
 	}
 
 #elif defined(_MSC_VER)
+	inline u8 rol8(u8 x, u8 n)
+	{
+		return _rotl8(x, n);
+	}
+
+	inline u8 ror8(u8 x, u8 n)
+	{
+		return _rotr8(x, n);
+	}
+
+	inline u16 rol16(u16 x, u16 n)
+	{
+		return _rotl16(x, (u8)n);
+	}
+
+	inline u16 ror16(u16 x, u16 n)
+	{
+		return _rotr16(x, (u8)n);
+	}
+
+	inline u32 rol32(u32 x, u32 n)
+	{
+		return _rotl(x, (int)n);
+	}
+
+	inline u32 ror32(u32 x, u32 n)
+	{
+		return _rotr(x, (int)n);
+	}
+
+	inline u64 rol64(u64 x, u64 n)
+	{
+		return _rotl64(x, (int)n);
+	}
+
+	inline u64 ror64(u64 x, u64 n)
+	{
+		return _rotr64(x, (int)n);
+	}
 
 	inline u64 umulh64(u64 x, u64 y)
 	{

Utilities/cfmt.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "types.h"
-#include "asm.h"
 #include <climits>
 #include <string>
 #include <vector>

Utilities/cond.h

@@ -3,7 +3,6 @@
 #include "types.h"
 #include "util/atomic.hpp"
 #include <shared_mutex>
-#include "asm.h"
 
 // Lightweight condition variable
 class cond_variable