Changeset 14805 in vbox for trunk

Timestamp:

Nov 29, 2008 3:24:36 AM (16 years ago)

Author:

vboxsync

Message:

#3202: Use SUPR0Abs*.

Location:

trunk

Files:

• include/VBox/sup.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (1 diff)

trunk/include/VBox/sup.h

@@ -844 +844 @@
 SUPR0DECL(int) SUPR0NativeEnableHwVirtExt(PSUPDRVSESSION pSession, bool fEnable);
 
+/** @name Absolute symbols
+ * Take the address of these, don't try call them.
+ * @{ */
+SUPR0DECL(void) SUPR0AbsIs64bit(void);
+SUPR0DECL(void) SUPR0Abs64bitKernelCS(void);
+SUPR0DECL(void) SUPR0Abs64bitKernelSS(void);
+SUPR0DECL(void) SUPR0Abs64bitKernelDS(void);
+SUPR0DECL(void) SUPR0AbsKernelCS(void);
+SUPR0DECL(void) SUPR0AbsKernelSS(void);
+SUPR0DECL(void) SUPR0AbsKernelDS(void);
+SUPR0DECL(void) SUPR0AbsKernelES(void);
+SUPR0DECL(void) SUPR0AbsKernelFS(void);
+SUPR0DECL(void) SUPR0AbsKernelGS(void);
+/** @} */
 
 /**

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -824 +824 @@
 
         /* Selector registers. */
+#ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
+        if (VMX_IS_64BIT_HOST_MODE())
+        {
+            cs = (RTSEL)(uintptr_t)&SUPR0Abs64bitKernelCS;
+            ss = (RTSEL)(uintptr_t)&SUPR0Abs64bitKernelSS;
+        }
+        else
+        {
+            /* sysenter loads LDT cs & ss, VMX doesn't like this. Load the GDT ones (safe). */
+            cs = (RTSEL)(uintptr_t)&SUPR0AbsKernelCS;
+            ss = (RTSEL)(uintptr_t)&SUPR0AbsKernelSS;
+        }
+#else
         cs = ASMGetCS();
         ss = ASMGetSS();
-#ifdef RT_OS_DARWIN
-        /* VMX doesn't like LDT cs and ss, so switch to the GDT ones. Weird kernel. */
-        if (cs == 0x04)                 /* SYSENTER_CS & ~3 */
-            cs = 0x08;                  /* KERNEL_CS */
-        if (ss == 0x0c)                 /* (SYSENTER_CS & ~3) + 8 */
-            ss = 0x10;                  /* KERNEL_DS */
-        if (VMX_IS_64BIT_HOST_MODE())
-        {
-            cs = 0x80;                  /* KERNEL64_CS - fixme */
-            ss = 0x88;                  /* KERNEL64_CS - fixme */
-        }
 #endif
         rc  = VMXWriteVMCS(VMX_VMCS16_HOST_FIELD_CS,          cs);