Changeset 42165 in vbox for trunk/include/VBox/vmm

Timestamp:

Jul 16, 2012 1:36:01 PM (13 years ago)

Author:

vboxsync

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

79144

Message:

CPUMIsGuestIn64BitCode/CPUMIsGuestIn64BitCodeEx changes together with some early lazily loading of hidden selectors (raw-mode).

Location:

trunk/include/VBox/vmm

Files:

• cpum.h (modified) (3 diffs)
• cpumctx.h (modified) (1 diff)
• selm.h (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -170 +170 @@
 VMMDECL(bool)       CPUMGetGuestCpuIdFeature(PVM pVM, CPUMCPUIDFEATURE enmFeature);
 VMMDECL(void)       CPUMSetGuestCtx(PVMCPU pVCpu, const PCPUMCTX pCtx);
+VMM_INT_DECL(void)  CPUMGuestLazyLoadHiddenCsAndSs(PVMCPU pVCpu);
+VMM_INT_DECL(void)  CPUMGuestLazyLoadHiddenSelectorReg(PVMCPU pVCpu, PCPUMSELREG pSReg);
 /** @} */
 
@@ -178 +180 @@
 VMMDECL(bool)       CPUMIsGuestIn16BitCode(PVMCPU pVCpu);
 VMMDECL(bool)       CPUMIsGuestIn32BitCode(PVMCPU pVCpu);
+VMMDECL(bool)       CPUMIsGuestIn64BitCode(PVMCPU pVCpu);
 VMMDECL(bool)       CPUMIsGuestNXEnabled(PVMCPU pVCpu);
 VMMDECL(bool)       CPUMIsGuestPageSizeExtEnabled(PVMCPU pVCpu);
@@ -236 +239 @@
 }
 
+VMM_INT_DECL(bool) CPUMIsGuestIn64BitCodeSlow(PCPUMCTX pCtx);
+
 /**
  * Tests if the guest is running in 64 bits mode or not.
  *
  * @returns true if in 64 bits protected mode, otherwise false.
- * @param   pVM     The VM handle.
+ * @param   pVCpu   The current virtual CPU.
  * @param   pCtx    Current CPU context
  */
-DECLINLINE(bool)    CPUMIsGuestIn64BitCode(PVMCPU pVCpu, PCCPUMCTXCORE pCtx)
-{
-    if (!CPUMIsGuestInLongMode(pVCpu))
-        return false;
-
-    return pCtx->cs.Attr.n.u1Long;
-}
-
-/**
- * Tests if the guest is running in 64 bits mode or not.
- *
- * @returns true if in 64 bits protected mode, otherwise false.
- * @param   pVM     The VM handle.
- * @param   pCtx    Current CPU context
- */
-DECLINLINE(bool)    CPUMIsGuestIn64BitCodeEx(PCCPUMCTX pCtx)
+DECLINLINE(bool)    CPUMIsGuestIn64BitCodeEx(PCPUMCTX pCtx)
 {
     if (!(pCtx->msrEFER & MSR_K6_EFER_LMA))
         return false;
-
+    if (!CPUMSELREG_ARE_HIDDEN_PARTS_VALID(&pCtx->cs))
+        return CPUMIsGuestIn64BitCodeSlow(pCtx);
     return pCtx->cs.Attr.n.u1Long;
 }

trunk/include/VBox/vmm/cpumctx.h

@@ -78 +78 @@
 #define CPUMSELREG_FLAGS_STALE      UINT16_C(0x0002)
 /** @} */
+
+/** Checks if the hidden parts of the selector register are valid. */
+#define CPUMSELREG_ARE_HIDDEN_PARTS_VALID(a_pSelReg) (   ((a_pSelReg)->fFlags & CPUMSELREG_FLAGS_VALID) \
+                                                      && (a_pSelReg)->ValidSel == (a_pSelReg)->Sel )
 
 /** Old type used for the hidden register part.

trunk/include/VBox/vmm/selm.h

@@ -83 +83 @@
 VMMDECL(DISCPUMODE) SELMGetCpuModeFromSelector(PVMCPU pVCpu, X86EFLAGS eflags, RTSEL Sel, PCCPUMSELREGHID pHiddenSel);
 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);
+#endif