[ros-diffs] [tkreuzer] 35546: Fix __readmsr and __writemsr on amd64

Author: tkreuzer
Date: Fri Aug 22 20:18:07 2008
New Revision: 35546

URL: http://svn.reactos.org/svn/reactos?rev=35546&view=rev
Log:
Fix __readmsr and __writemsr on amd64

Modified:
    branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h

Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Fri Aug 22
20:18:07 2008
@@ -1200,14 +1200,24 @@
 /*** System operations ***/
 static __inline__ __attribute__((always_inline)) unsigned long long __readmsr(const int
reg)
 {
+#ifdef _M_AMD64
+	unsigned long low, high;
+	__asm__ __volatile__("rdmsr" : "=a" (low), "=d" (high) :
"c" (reg));
+	return (high << 32) | low;
+#else
 	unsigned long long retval;
 	__asm__ __volatile__("rdmsr" : "=A" (retval) : "c"
(reg));
 	return retval;
+#endif
 }
 
 static __inline__ __attribute__((always_inline)) void __writemsr(const unsigned long
Register, const unsigned long long Value)
 {
+#ifdef _M_AMD64
+	__asm__ __volatile__("wrmsr" : : "a" (Value), "d" (Value
>> 32), "c" (Register));
+#else
 	__asm__ __volatile__("wrmsr" : : "A" (Value), "c"
(Register));
+#endif
 }
 
 static __inline__ __attribute__((always_inline)) unsigned long long __readpmc(const int
counter)