CommonFuncs.h: use inline functions instead of macros

Author: oltolm

Common/CommonFuncs.h

@@ -46,49 +46,75 @@
 #define Crash() {kill(getpid(), SIGINT);}
 #endif
 
+#else // WIN32
+
+// Function Cross-Compatibility
+#ifndef __MINGW32__
+	#define strcasecmp _stricmp
+	#define strncasecmp _strnicmp
+#endif
+
+#ifndef __MINGW32__
+#define unlink _unlink
+#endif
+
+// 64 bit offsets for windows
+#ifndef __MINGW32__
+	#define fseeko _fseeki64
+	#define ftello _ftelli64
+	#define atoll _atoi64
+#endif
+	#define Crash() {__debugbreak();}
+#endif // WIN32 ndef
+
+#if defined(_MSC_VER)
+#include <cstdlib>
+#elif (PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64))
+#include <x86intrin.h>
+#endif
+
 inline u32 __rotl(u32 x, int shift) {
+#if defined(_MSC_VER)
+	return _rotl(x, shift);
+#elif (PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64))
+	return __rold(x, shift);
+#else
 	shift &= 31;
 	if (!shift) return x;
 	return (x << shift) | (x >> (32 - shift));
+#endif
 }
 
 inline u64 __rotl64(u64 x, unsigned int shift){
+#if defined(_MSC_VER)
+	return _rotl64(x, shift);
+#elif (PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64))
+	return __rolq(x, shift);
+#else
 	unsigned int n = shift % 64;
 	return (x << n) | (x >> (64 - n));
+#endif
 }
 
 inline u32 __rotr(u32 x, int shift) {
+#if defined(_MSC_VER)
+	return _rotr(x, shift);
+#elif (PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64))
+	return __rord(x, shift);
+#else
     shift &= 31;
     if (!shift) return x;
     return (x >> shift) | (x << (32 - shift));
+#endif
 }
 
 inline u64 __rotr64(u64 x, unsigned int shift){
+#if defined(_MSC_VER)
+	return _rotr64(x, shift);
+#elif (PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64))
+	return __rorq(x, shift);
+#else
 	unsigned int n = shift % 64;
 	return (x >> n) | (x << (64 - n));
-}
-
-#else // WIN32
-
-// Function Cross-Compatibility
-#ifndef __MINGW32__
-	#define strcasecmp _stricmp
-	#define strncasecmp _strnicmp
-#endif
-
-#ifndef __MINGW32__
-#define unlink _unlink
-#define __rotl _rotl
-#define __rotl64 _rotl64
-#define __rotr _rotr
-#define __rotr64 _rotr64
 #endif
-
-// 64 bit offsets for windows
-#ifndef __MINGW32__
-	#define fseeko _fseeki64
-	#define ftello _ftelli64
-	#define atoll _atoi64
-#endif
-	#define Crash() {__debugbreak();}
-#endif // WIN32 ndef
+}

Core/MIPS/MIPSInt.cpp

@@ -715,11 +715,7 @@ namespace MIPSInt
 			}
 			else if (_RS == 1) //rotr
 			{
-#ifdef __MINGW32__
-				R(rd) = _rotr(R(rt), sa);
-#else
 				R(rd) = __rotr(R(rt), sa);
-#endif
 				break;
 			}
 			else
@@ -735,11 +731,7 @@ namespace MIPSInt
 			}
 			else if (_FD == 1) // rotrv
 			{
-#ifdef __MINGW32__
-				R(rd) = _rotr(R(rt), R(rs));
-#else
 				R(rd) = __rotr(R(rt), R(rs));
-#endif
 				break;
 			}
 			else goto wrong;