Changeset 42427 in vbox for trunk/include

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.

Location:

trunk/include

Files:

• VBox/vmm/cpum.h (modified) (1 diff)
• VBox/vmm/cpumctx.h (modified) (1 diff)
• VBox/vmm/selm.h (modified) (1 diff)
• iprt/x86.h (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -91 +91 @@
 VMMDECL(RTSEL)      CPUMGetGuestTR(PVMCPU pVCpu, PCPUMSELREGHID pHidden);
 VMMDECL(RTSEL)      CPUMGetGuestLDTR(PVMCPU pVCpu);
+VMMDECL(RTSEL)      CPUMGetGuestLdtrEx(PVMCPU pVCpu, uint64_t *pGCPtrBase, uint32_t *pcbLimit);
 VMMDECL(uint64_t)   CPUMGetGuestCR0(PVMCPU pVCpu);
 VMMDECL(uint64_t)   CPUMGetGuestCR2(PVMCPU pVCpu);

trunk/include/VBox/vmm/cpumctx.h

@@ -86 +86 @@
      && (   (a_pSelReg)->ValidSel == (a_pSelReg)->Sel \
          || (   (a_pVCpu) /*!= NULL*/ \
-             && (a_pSelReg)->ValidSel == ((a_pSelReg)->Sel & X86_SEL_MASK_RPL) \
+             && (a_pSelReg)->ValidSel == ((a_pSelReg)->Sel & X86_SEL_MASK_OFF_RPL) \
              && ((a_pSelReg)->Sel      & X86_SEL_RPL) == 1 \
              && ((a_pSelReg)->ValidSel & X86_SEL_RPL) == 0 \

trunk/include/VBox/vmm/selm.h

@@ -80 +80 @@
 VMMDECL(int)            SELMValidateAndConvertCSAddr(PVMCPU pVCpu, X86EFLAGS eflags, RTSEL SelCPL, RTSEL SelCS,
                                                      PCPUMSELREG pSRegCS, RTGCPTR Addr, PRTGCPTR ppvFlat);
-VMMDECL(int)            SELMGetLDTFromSel(PVM pVM, RTSEL SelLdt, PRTGCPTR ppvLdt, unsigned *pcbLimit);
 #ifdef VBOX_WITH_RAW_MODE
 VMM_INT_DECL(void)      SELMLoadHiddenSelectorReg(PVMCPU pVCpu, PCCPUMCTX pCtx, PCPUMSELREG pSReg);

trunk/include/iprt/x86.h

@@ -2955 +2955 @@
  * The shift used to convert a selector from and to index an index (C).
  */
-#define X86_SEL_SHIFT       3
+#define X86_SEL_SHIFT           3
 
 /**
  * The mask used to mask off the table indicator and RPL of an selector.
  */
-#define X86_SEL_MASK        0xfff8U
+#define X86_SEL_MASK            0xfff8U
 
 /**
  * The mask used to mask off the RPL of an selector.
- */
-#define X86_SEL_MASK_RPL    0xfffcU
+ * This is suitable for checking for NULL selectors.
+ */
+#define X86_SEL_MASK_OFF_RPL    0xfffcU
 
 /**
  * The bit indicating that a selector is in the LDT and not in the GDT.
  */
-#define X86_SEL_LDT         0x0004U
+#define X86_SEL_LDT             0x0004U
+
 /**
  * The bit mask for getting the RPL of a selector.
  */
-#define X86_SEL_RPL         0x0003U
+#define X86_SEL_RPL             0x0003U
+
+/**
+ * The mask covering both RPL and LDT.
+ * This is incidentally the same as sizeof(X86DESC) - 1, so good for limit
+ * checks.
+ */
+#define X86_SEL_RPL_LDT         0x0007U
 
 /** @} */