Changeset 49845 in vbox

Timestamp:

Dec 9, 2013 3:18:59 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91190

Message:

Adding ASMWrMsrEx and ASMRdMSrEx.

Location:

trunk

Files:

• include/iprt/asm-amd64-x86.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (5 diffs)
• src/VBox/Runtime/common/asm/ASMRdMsrEx.asm (added)
• src/VBox/Runtime/common/asm/ASMWrMsrEx.asm (added)

trunk/include/iprt/asm-amd64-x86.h

@@ -1767 +1767 @@
 
 /**
+ * Reads a machine specific register, extended version (for AMD).
+ *
+ * @returns Register content.
+ * @param   uRegister   Register to read.
+ * @param   uXDI        RDI/EDI value.
+ */
+#if RT_INLINE_ASM_EXTERNAL
+DECLASM(uint64_t) ASMRdMsrEx(uint32_t uRegister, RTCCUINTREG uXDI);
+#else
+DECLINLINE(uint64_t) ASMRdMsrEx(uint32_t uRegister, RTCCUINTREG uXDI)
+{
+    RTUINT64U u;
+# if RT_INLINE_ASM_GNU_STYLE
+    __asm__ __volatile__("rdmsr\n\t"
+                         : "=a" (u.s.Lo),
+                           "=d" (u.s.Hi)
+                         : "c" (uRegister),
+                           "D" (uXDI));
+
+# else
+    __asm
+    {
+        mov     ecx, [uRegister]
+        xchg    edi, [uXDI]
+        rdmsr
+        mov     [u.s.Lo], eax
+        mov     [u.s.Hi], edx
+        xchg    edi, [uXDI]
+    }
+# endif
+
+    return u.u;
+}
+#endif
+
+
+/**
+ * Writes a machine specific register, extended version (for AMD).
+ *
+ * @returns Register content.
+ * @param   uRegister   Register to write to.
+ * @param   uXDI        RDI/EDI value.
+ * @param   u64Val      Value to write.
+ */
+#if RT_INLINE_ASM_EXTERNAL
+DECLASM(void) ASMWrMsrEx(uint32_t uRegister, RTCCUINTREG uXDI, uint64_t u64Val);
+#else
+DECLINLINE(void) ASMWrMsrEx(uint32_t uRegister, RTCCUINTREG uXDI, uint64_t u64Val)
+{
+    RTUINT64U u;
+
+    u.u = u64Val;
+# if RT_INLINE_ASM_GNU_STYLE
+    __asm__ __volatile__("wrmsr\n\t"
+                         ::"a" (u.s.Lo),
+                           "d" (u.s.Hi),
+                           "c" (uRegister),
+                           "D" (uXDI));
+
+# else
+    __asm
+    {
+        mov     ecx, [uRegister]
+        xchg    edi, [uXDI]
+        mov     edx, [u.s.Hi]
+        mov     eax, [u.s.Lo]
+        wrmsr
+        xchg    edi, [uXDI]
+    }
+# endif
+}
+#endif
+
+
+
+/**
  * Reads low part of a machine specific register.
  *

trunk/src/VBox/Runtime/Makefile.kmk

@@ -538 +538 @@
         common/asm/ASMAtomicUoAndU32.asm \
         common/asm/ASMAtomicUoOrU64.asm \
-        common/asm/ASMAtomicUoOrU32.asm
+        common/asm/ASMAtomicUoOrU32.asm \
+        common/asm/ASMRdMsrEx.asm \
+        common/asm/ASMWrMsrEx.asm
 RuntimeR3_SOURCES.amd64 += \
         common/asm/ASMCpuIdExSlow.asm \
@@ -544 +546 @@
         common/asm/ASMAtomicUoAndU32.asm \
         common/asm/ASMAtomicUoOrU64.asm \
-        common/asm/ASMAtomicUoOrU32.asm
+        common/asm/ASMAtomicUoOrU32.asm \
+        common/asm/ASMRdMsrEx.asm \
+        common/asm/ASMWrMsrEx.asm
 
 # Some versions of GCC might require this.
@@ -1664 +1668 @@
         common/asm/ASMAtomicUoAndU32.asm \
         common/asm/ASMAtomicUoOrU64.asm \
-        common/asm/ASMAtomicUoOrU32.asm
+        common/asm/ASMAtomicUoOrU32.asm \
+        common/asm/ASMRdMsrEx.asm \
+        common/asm/ASMWrMsrEx.asm
 RuntimeR0_SOURCES.amd64 += \
         common/asm/ASMCpuIdExSlow.asm \
@@ -1670 +1676 @@
         common/asm/ASMAtomicUoAndU32.asm \
         common/asm/ASMAtomicUoOrU64.asm \
-        common/asm/ASMAtomicUoOrU32.asm
+        common/asm/ASMAtomicUoOrU32.asm \
+        common/asm/ASMRdMsrEx.asm \
+        common/asm/ASMWrMsrEx.asm
 
 #if1of ($(KBUILD_TARGET_ARCH),amd64 x86)
@@ -1807 +1815 @@
         r0drv/generic/semspinmutex-r0drv-generic.c \
         VBox/log-vbox.cpp \
+
+RuntimeR0Drv_SOURCES.amd64 = \
+        common/asm/ASMRdMsrEx.asm \
+        common/asm/ASMWrMsrEx.asm
+RuntimeR0Drv_SOURCES.x86   = \
+        common/asm/ASMRdMsrEx.asm \
+        common/asm/ASMWrMsrEx.asm
+
 
 RuntimeR0Drv_SOURCES.linux = \