Changeset 48369 in vbox for trunk/src

Timestamp:

Sep 6, 2013 5:40:56 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nits.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMVMXR0.cpp (modified) (6 diffs)
• HMVMXR0.h (modified) (2 diffs)

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

@@ -2224 +2224 @@
 {
     int rc = VERR_INTERNAL_ERROR_5;
-    RTSEL uSelDS   = 0;
-    RTSEL uSelES   = 0;
-    RTSEL uSelFS   = 0;
-    RTSEL uSelGS   = 0;
-    RTSEL uSelTR   = 0;
 
     /*
@@ -2234 +2229 @@
      */
 #if HC_ARCH_BITS == 64
+    RTSEL uSelDS = ASMGetDS();
+    RTSEL uSelES = ASMGetES();
+    RTSEL uSelFS = ASMGetFS();
+    RTSEL uSelGS = ASMGetGS();
+#else
+    RTSEL uSelDS = 0;
+    RTSEL uSelES = 0;
+    RTSEL uSelFS = 0;
+    RTSEL uSelGS = 0;
+#endif
+
+    /* Recalculate which host-state bits need to be manually restored. */
     pVCpu->hm.s.vmx.fRestoreHostFlags = 0;
-    uSelDS   = ASMGetDS();
-    uSelES   = ASMGetES();
-    uSelFS   = ASMGetFS();
-    uSelGS   = ASMGetGS();
-#endif
 
     /*
      * Host CS and SS segment registers.
      */
+#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
     RTSEL uSelCS;
     RTSEL uSelSS;
-#ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
     if (HMVMX_IS_64BIT_HOST_MODE())
     {
@@ -2259 +2261 @@
     }
 #else
-    uSelCS = ASMGetCS();
-    uSelSS = ASMGetSS();
+    RTSEL uSelCS = ASMGetCS();
+    RTSEL uSelSS = ASMGetSS();
 #endif
 
@@ -2266 +2268 @@
      * Host TR segment register.
      */
-    uSelTR = ASMGetTR();
+    RTSEL uSelTR = ASMGetTR();
 
 #if HC_ARCH_BITS == 64
@@ -6127 +6129 @@
     Assert(!CPUMIsHyperDebugStateActive(pVCpu));
 
+#if HC_ARCH_BITS == 64
     /* Restore host-state bits that VT-x only restores partially. */
     if (   (pVCpu->hm.s.vmx.fRestoreHostFlags & VMX_RESTORE_HOST_REQUIRED)
@@ -6135 +6138 @@
         pVCpu->hm.s.vmx.fRestoreHostFlags = 0;
     }
+#endif
 
     STAM_PROFILE_ADV_SET_STOPPED(&pVCpu->hm.s.StatEntry);

trunk/src/VBox/VMM/VMMR0/HMVMXR0.h

@@ -51 +51 @@
 # endif
 
-/* Cached VMCS accesses -- defined only for 32 hosts (with 64-bit guest support). */
+/* Cached VMCS accesses -- defined only for 32-bit hosts (with 64-bit guest support). */
 # ifdef VMX_USE_CACHED_VMCS_ACCESSES
 VMMR0DECL(int) VMXWriteCachedVmcsEx(PVMCPU pVCpu, uint32_t idxField, uint64_t u64Val);
@@ -64 +64 @@
 
 # ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
+/* Don't use fAllow64BitGuests for VMXReadVmcsGstN() even though it looks right, as it can be forced to 'true'.
+   HMVMX_IS_64BIT_HOST_MODE() is what we need. */
 #  define VMXReadVmcsHstN(idxField, p64Val)               HMVMX_IS_64BIT_HOST_MODE() ?                      \
                                                             VMXReadVmcs64(idxField, p64Val)                 \
                                                           : (*(p64Val) &= UINT64_C(0xffffffff),             \
                                                              VMXReadVmcs32(idxField, (uint32_t *)(p64Val)))
-/* Don't use fAllow64BitGuests for VMXReadVmcsGstN() even though it looks right, as it can be forced to 'true'.
-   HMVMX_IS_64BIT_HOST_MODE() is what we need. */
 #  define VMXReadVmcsGstN                                 VMXReadVmcsHstN
 #  define VMXReadVmcsGstNByIdxVal                         VMXReadVmcsGstN