Changeset 42427 in vbox for trunk/src/VBox/VMM/VMMRC/SELMRC.cpp

Timestamp:

Jul 26, 2012 11:48:01 PM (13 years ago)

Author:

vboxsync

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

79529

Message:

VMM: Fixed some selector arithmetic, introducing a new constand and renaming and old one to make things clearer. Also added CPUMGetGuestLdtrEx and make some (but not all) of SELM use this instead of shadow GDT.

File:

• trunk/src/VBox/VMM/VMMRC/SELMRC.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMRC/SELMRC.cpp

@@ -95 +95 @@
      */
     RTSEL   Sel = iGDTEntry << X86_SEL_SHIFT;
-    Assert(   !(pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS] & ~X86_SEL_MASK)
-           && !(pVM->selm.s.aHyperSel[SELM_HYPER_SEL_DS] & ~X86_SEL_MASK)
-           && !(pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS64] & ~X86_SEL_MASK)
-           && !(pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS] & ~X86_SEL_MASK)
-           && !(pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS_TRAP08] & ~X86_SEL_MASK));
+    Assert(   !(pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS]         & ~X86_SEL_MASK_OFF_RPL)
+           && !(pVM->selm.s.aHyperSel[SELM_HYPER_SEL_DS]         & ~X86_SEL_MASK_OFF_RPL)
+           && !(pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS64]       & ~X86_SEL_MASK_OFF_RPL)
+           && !(pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS]        & ~X86_SEL_MASK_OFF_RPL)
+           && !(pVM->selm.s.aHyperSel[SELM_HYPER_SEL_TSS_TRAP08] & ~X86_SEL_MASK_OFF_RPL));
     if (    pVM->selm.s.aHyperSel[SELM_HYPER_SEL_CS]         == Sel
         ||  pVM->selm.s.aHyperSel[SELM_HYPER_SEL_DS]         == Sel
@@ -137 +137 @@
     for (unsigned iSReg = 0; iSReg <= X86_SREG_COUNT; iSReg++)
     {
-        if (Sel == (paSReg[iSReg].Sel & X86_SEL_MASK_RPL))
+        if (Sel == (paSReg[iSReg].Sel & X86_SEL_MASK_OFF_RPL))
         {
             if (CPUMSELREG_ARE_HIDDEN_PARTS_VALID(pVCpu, &paSReg[iSReg]))
@@ -200 +200 @@
     for (unsigned iSReg = 0; iSReg <= X86_SREG_COUNT; iSReg++)
     {
-        if (iGDTEntry == (paSReg[iSReg].Sel & X86_SEL_MASK_RPL))
+        if (iGDTEntry == (paSReg[iSReg].Sel & X86_SEL_MASK_OFF_RPL))
         {
             if (!CPUMSELREG_ARE_HIDDEN_PARTS_VALID(pVCpu, &paSReg[iSReg]))