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

Timestamp:

May 23, 2007 3:09:44 PM (18 years ago)

Author:

vboxsync

Message:

Corrections for 64 bits descriptors

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (8 diffs)

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

@@ -494 +494 @@
         }
 
-        pDesc  = &((PX86DESCHC)gdtr.pGdt)[SelTR >> X86_SEL_SHIFT];
+        pDesc  = &((PX86DESCHC)gdtr.pGdt)[SelTR >> X86_SEL_SHIFT_HC];
+#if HC_ARCH_BITS == 64
+        trBase = pDesc->Gen.u16BaseLow | (pDesc->Gen.u8BaseHigh1 << 16ULL) | (pDesc->Gen.u8BaseHigh2 << 24ULL) | pDesc->Gen.u32BaseHigh3 << 32ULL;
+#else
         trBase = pDesc->Gen.u16BaseLow | (pDesc->Gen.u8BaseHigh1 << 16) | (pDesc->Gen.u8BaseHigh2 << 24);
+#endif
         rc = VMXWriteVMCS(VMX_VMCS_HOST_TR_BASE, trBase);
         AssertRC(rc);
@@ -1048 +1052 @@
             if (val < gdtr.cbGdt)
             {
-                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT];
+                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT_HC];
                 HWACCMR0DumpDescriptor(pDesc, val, "CS: ");
             }
@@ -1056 +1060 @@
             if (val < gdtr.cbGdt)
             {
-                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT];
+                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT_HC];
                 HWACCMR0DumpDescriptor(pDesc, val, "DS: ");
             }
@@ -1064 +1068 @@
             if (val < gdtr.cbGdt)
             {
-                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT];
+                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT_HC];
                 HWACCMR0DumpDescriptor(pDesc, val, "ES: ");
             }
@@ -1072 +1076 @@
             if (val < gdtr.cbGdt)
             {
-                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT];
+                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT_HC];
                 HWACCMR0DumpDescriptor(pDesc, val, "FS: ");
             }
@@ -1080 +1084 @@
             if (val < gdtr.cbGdt)
             {
-                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT];
+                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT_HC];
                 HWACCMR0DumpDescriptor(pDesc, val, "GS: ");
             }
@@ -1088 +1092 @@
             if (val < gdtr.cbGdt)
             {
-                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT];
+                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT_HC];
                 HWACCMR0DumpDescriptor(pDesc, val, "SS: ");
             }
@@ -1096 +1100 @@
             if (val < gdtr.cbGdt)
             {
-                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT];
+                pDesc  = &((PX86DESCHC)gdtr.pGdt)[val >> X86_SEL_SHIFT_HC];
                 HWACCMR0DumpDescriptor(pDesc, val, "TR: ");
             }