From b11fabe867c714f3c2ebe2e0dd7940b3c2906de6 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Mon, 4 Jan 2016 15:35:02 +0100
Subject: [PATCH] Changed: Use __rdtsc() intrinsics everywhere for Intel CPUs

--HG--
branch : develop
---
 code/nel/include/nel/misc/common.h | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/code/nel/include/nel/misc/common.h b/code/nel/include/nel/misc/common.h
index 028fc0b0d..191db5188 100644
--- a/code/nel/include/nel/misc/common.h
+++ b/code/nel/include/nel/misc/common.h
@@ -38,6 +38,10 @@
 #	include <sys/types.h>
 #endif
 
+#if defined(NL_CPU_INTEL) && defined(NL_COMP_GCC)
+#include "x86intrin.h"
+#endif
+
 #include "string_common.h"
 
 #ifdef NL_OS_WINDOWS
@@ -65,20 +69,8 @@ namespace	NLMISC
 
 inline uint64 rdtsc()
 {
-	uint64 ticks;
-#	ifdef NL_OS_WINDOWS
-#	ifdef NL_NO_ASM
-		ticks = uint64(__rdtsc());
-#	else
-		// We should use the intrinsic code now. ticks = uint64(__rdtsc());
-		__asm	rdtsc
-		__asm	mov		DWORD PTR [ticks], eax
-		__asm	mov		DWORD PTR [ticks + 4], edx
-#	endif // NL_NO_ASM
-#	else
-		__asm__ volatile(".byte 0x0f, 0x31" : "=a" (ticks.low), "=d" (ticks.high));
-#	endif // NL_OS_WINDOWS
-	return ticks;
+	// __rdtsc() is defined under all platforms
+	return uint64(__rdtsc());
 }
 
 #endif	// NL_CPU_INTEL