Changeset 25835 in vbox for trunk/include

Timestamp:

Jan 14, 2010 4:27:58 PM (15 years ago)

Author:

vboxsync

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

56615

Message:

CPUM,VMM: Avoid calling CPUMGetGuestEFER until it's needed (see defect 4597). Also pushed the inlined CPUM predicates that was calling into CPUMGetSomething anyway into CPUMAllRegs.cpp since that's faster and smaller.

File:

• trunk/include/VBox/cpum.h (modified) (9 diffs)

trunk/include/VBox/cpum.h

@@ -661 +661 @@
 VMMDECL(uint64_t)   CPUMGetGuestMsr(PVMCPU pVCpu, unsigned idMsr);
 VMMDECL(void)       CPUMSetGuestMsr(PVMCPU pVCpu, unsigned idMsr, uint64_t valMsr);
+VMMDECL(CPUMCPUVENDOR)  CPUMGetGuestCpuVendor(PVM pVM);
+VMMDECL(CPUMCPUVENDOR)  CPUMGetHostCpuVendor(PVM pVM);
 /** @} */
 
@@ -703 +705 @@
 /** @} */
 
+
 /** @name Misc Guest Predicate Functions.
  * @{  */
 
-
-VMMDECL(bool)           CPUMIsGuestIn16BitCode(PVMCPU pVCpu);
-VMMDECL(bool)           CPUMIsGuestIn32BitCode(PVMCPU pVCpu);
-
-VMMDECL(CPUMCPUVENDOR)  CPUMGetGuestCpuVendor(PVM pVM);
-VMMDECL(CPUMCPUVENDOR)  CPUMGetHostCpuVendor(PVM pVM);
-
-/**
- * Tests if the guest is running in real mode or not.
- *
- * @returns true if in real mode, otherwise false.
- * @param   pVM     The VM handle.
- */
-DECLINLINE(bool) CPUMIsGuestInRealMode(PVMCPU pVCpu)
-{
-    return !(CPUMGetGuestCR0(pVCpu) & X86_CR0_PE);
-}
+VMMDECL(bool)       CPUMIsGuestIn16BitCode(PVMCPU pVCpu);
+VMMDECL(bool)       CPUMIsGuestIn32BitCode(PVMCPU pVCpu);
+VMMDECL(bool)       CPUMIsGuestNXEnabled(PVMCPU pVCpu);
+VMMDECL(bool)       CPUMIsGuestInRealMode(PVMCPU pVCpu);
+VMMDECL(bool)       CPUMIsGuestInProtectedMode(PVMCPU pVCpu);
+VMMDECL(bool)       CPUMIsGuestInPagedProtectedMode(PVMCPU pVCpu);
+VMMDECL(bool)       CPUMIsGuestInLongMode(PVMCPU pVCpu);
+VMMDECL(bool)       CPUMIsGuestInPAEMode(PVMCPU pVCpu);
 
 /**
@@ -730 +724 @@
  * @param   pCtx    Current CPU context
  */
-DECLINLINE(bool) CPUMIsGuestInRealModeEx(PCPUMCTX pCtx)
+DECLINLINE(bool)    CPUMIsGuestInRealModeEx(PCPUMCTX pCtx)
 {
     return !(pCtx->cr0 & X86_CR0_PE);
@@ -736 +730 @@
 
 /**
- * Tests if the guest is running in protected or not.
- *
- * @returns true if in protected mode, otherwise false.
- * @param   pVM     The VM handle.
- */
-DECLINLINE(bool) CPUMIsGuestInProtectedMode(PVMCPU pVCpu)
-{
-    return !!(CPUMGetGuestCR0(pVCpu) & X86_CR0_PE);
-}
-
-/**
  * Tests if the guest is running in paged protected or not.
  *
@@ -752 +735 @@
  * @param   pVM     The VM handle.
  */
-DECLINLINE(bool) CPUMIsGuestInPagedProtectedMode(PVMCPU pVCpu)
-{
-    return (CPUMGetGuestCR0(pVCpu) & (X86_CR0_PE | X86_CR0_PG)) == (X86_CR0_PE | X86_CR0_PG);
-}
-
-/**
- * Tests if the guest is running in paged protected or not.
- *
- * @returns true if in paged protected mode, otherwise false.
- * @param   pVM     The VM handle.
- */
-DECLINLINE(bool) CPUMIsGuestInPagedProtectedModeEx(PCPUMCTX pCtx)
+DECLINLINE(bool)    CPUMIsGuestInPagedProtectedModeEx(PCPUMCTX pCtx)
 {
     return (pCtx->cr0 & (X86_CR0_PE | X86_CR0_PG)) == (X86_CR0_PE | X86_CR0_PG);
@@ -772 +744 @@
  *
  * @returns true if in long mode, otherwise false.
- * @param   pVM     The VM handle.
- */
-DECLINLINE(bool) CPUMIsGuestInLongMode(PVMCPU pVCpu)
-{
-    return (CPUMGetGuestEFER(pVCpu) & MSR_K6_EFER_LMA) == MSR_K6_EFER_LMA;
-}
-
-/**
- * Tests if the guest is running in long mode or not.
- *
- * @returns true if in long mode, otherwise false.
  * @param   pCtx    Current CPU context
  */
-DECLINLINE(bool) CPUMIsGuestInLongModeEx(PCPUMCTX pCtx)
+DECLINLINE(bool)    CPUMIsGuestInLongModeEx(PCPUMCTX pCtx)
 {
     return (pCtx->msrEFER & MSR_K6_EFER_LMA) == MSR_K6_EFER_LMA;
@@ -797 +758 @@
  * @param   pCtx    Current CPU context
  */
-DECLINLINE(bool) CPUMIsGuestIn64BitCode(PVMCPU pVCpu, PCCPUMCTXCORE pCtx)
+DECLINLINE(bool)    CPUMIsGuestIn64BitCode(PVMCPU pVCpu, PCCPUMCTXCORE pCtx)
 {
     if (!CPUMIsGuestInLongMode(pVCpu))
@@ -812 +773 @@
  * @param   pCtx    Current CPU context
  */
-DECLINLINE(bool) CPUMIsGuestIn64BitCodeEx(PCCPUMCTX pCtx)
+DECLINLINE(bool)    CPUMIsGuestIn64BitCodeEx(PCCPUMCTX pCtx)
 {
     if (!(pCtx->msrEFER & MSR_K6_EFER_LMA))
@@ -824 +785 @@
  *
  * @returns true if in PAE mode, otherwise false.
- * @param   pVM     The VM handle.
- */
-DECLINLINE(bool) CPUMIsGuestInPAEMode(PVMCPU pVCpu)
-{
-    return (    CPUMIsGuestInPagedProtectedMode(pVCpu)
-            &&  (CPUMGetGuestCR4(pVCpu) & X86_CR4_PAE)
-            &&  !CPUMIsGuestInLongMode(pVCpu));
-}
-
-/**
- * Tests if the guest is running in PAE mode or not.
- *
- * @returns true if in PAE mode, otherwise false.
  * @param   pCtx    Current CPU context
  */
-DECLINLINE(bool) CPUMIsGuestInPAEModeEx(PCPUMCTX pCtx)
-{
-    return (    CPUMIsGuestInPagedProtectedModeEx(pCtx)
-            &&  (pCtx->cr4 & X86_CR4_PAE)
+DECLINLINE(bool)    CPUMIsGuestInPAEModeEx(PCPUMCTX pCtx)
+{
+    return (    (pCtx->cr4 & X86_CR4_PAE)
+            &&  CPUMIsGuestInPagedProtectedModeEx(pCtx)
             &&  !CPUMIsGuestInLongModeEx(pCtx));
 }