Changeset 42407 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jul 26, 2012 11:41:35 AM (13 years ago)

Author:

vboxsync

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

79503

Message:

VMM: Futher work on dealing with hidden segment register, esp. when going stale.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWACCMR0.cpp (modified) (1 diff)
• HWVMXR0.cpp (modified) (2 diffs)

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

@@ -1861 +1861 @@
      * Limit and Base and format the output.
      */
-    uint32_t    u32Limit = X86DESC_LIMIT(*pDesc);
-    if (pDesc->Gen.u1Granularity)
-        u32Limit = u32Limit << PAGE_SHIFT | PAGE_OFFSET_MASK;
+    uint32_t    u32Limit = X86DESC_LIMIT_G(pDesc);
 
 # if HC_ARCH_BITS == 64
-    uint64_t    u32Base =  X86DESC64_BASE(*pDesc);
+    uint64_t    u32Base  = X86DESC64_BASE(pDesc);
 
     Log(("%s %04x - %RX64 %RX64 - base=%RX64 limit=%08x dpl=%d %s\n", pszMsg,
          Sel, pDesc->au64[0], pDesc->au64[1], u32Base, u32Limit, pDesc->Gen.u2Dpl, szMsg));
 # else
-    uint32_t    u32Base =  X86DESC_BASE(*pDesc);
+    uint32_t    u32Base  = X86DESC_BASE(pDesc);
 
     Log(("%s %04x - %08x %08x - base=%08x limit=%08x dpl=%d %s\n", pszMsg,

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

@@ -1247 +1247 @@
         if (VMX_IS_64BIT_HOST_MODE())
         {
-            uint64_t trBase64 = X86DESC64_BASE(*(PX86DESC64)pDesc);
+            uint64_t trBase64 = X86DESC64_BASE((PX86DESC64)pDesc);
             rc = VMXWriteVMCS64(VMX_VMCS_HOST_TR_BASE, trBase64);
             Log2(("VMX_VMCS_HOST_TR_BASE %RX64\n", trBase64));
@@ -1256 +1256 @@
         {
 #if HC_ARCH_BITS == 64
-            trBase = X86DESC64_BASE(*pDesc);
+            trBase = X86DESC64_BASE(pDesc);
 #else
-            trBase = X86DESC_BASE(*pDesc);
+            trBase = X86DESC_BASE(pDesc);
 #endif
             rc = VMXWriteVMCS(VMX_VMCS_HOST_TR_BASE, trBase);