Changeset 49712 in vbox

Timestamp:

Nov 28, 2013 11:58:42 PM (11 years ago)

Author:

vboxsync

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

91000

Message:

VMM/HMVMXR0: Comment, macros.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (15 diffs)

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

@@ -20 +20 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_HM
+#include <iprt/x86.h>
 #include <iprt/asm-amd64-x86.h>
 #include <iprt/thread.h>
@@ -2992 +2993 @@
  * Saves certain host MSRs in the VM-Exit MSR-load area and some in the
  * host-state area of the VMCS. Theses MSRs will be automatically restored on
- * the host after every successful VM exit.
+ * the host after every successful VM-exit.
  *
  * @returns VBox status code.
@@ -3381 +3382 @@
 
         /*
-         * If we're emulating real-mode using Virtual 8086 mode, save the real-mode eflags so we can restore them on VM exit.
+         * If we're emulating real-mode using Virtual 8086 mode, save the real-mode eflags so we can restore them on VM-exit.
          * Modify the real-mode guest's eflags so that VT-x can run the real-mode guest code under Virtual 8086 mode.
          */
@@ -3463 +3464 @@
             if (CPUMIsGuestPagingEnabledEx(pMixedCtx))
             {
-                /* The guest has paging enabled, let it access CR3 without causing a VM exit if supported. */
+                /* The guest has paging enabled, let it access CR3 without causing a VM-exit if supported. */
                 pVCpu->hm.s.vmx.u32ProcCtls &= ~(  VMX_VMCS_CTRL_PROC_EXEC_CR3_LOAD_EXIT
                                                  | VMX_VMCS_CTRL_PROC_EXEC_CR3_STORE_EXIT);
@@ -3469 +3470 @@
             else
             {
-                /* The guest doesn't have paging enabled, make CR3 access to cause VM exits to update our shadow. */
+                /* The guest doesn't have paging enabled, make CR3 access cause a VM-exit to update our shadow. */
                 pVCpu->hm.s.vmx.u32ProcCtls |=   VMX_VMCS_CTRL_PROC_EXEC_CR3_LOAD_EXIT
                                                | VMX_VMCS_CTRL_PROC_EXEC_CR3_STORE_EXIT;
@@ -3798 +3799 @@
         AssertRCReturn(rc, rc);
 
-        /* Setup CR4 mask. CR4 flags owned by the host, if the guest attempts to change them, that would cause a VM exit. */
+        /* Setup CR4 mask. CR4 flags owned by the host, if the guest attempts to change them, that would cause a VM-exit. */
         uint32_t u32CR4Mask = 0;
         u32CR4Mask =  X86_CR4_VME
@@ -3817 +3818 @@
 /**
  * Loads the guest debug registers into the guest-state area in the VMCS.
- * This also sets up whether #DB and MOV DRx accesses cause VM exits.
+ * This also sets up whether #DB and MOV DRx accesses cause VM-exits.
  *
  * The guest debug bits are partially shared with the host (e.g. DR6, DR0-3).
@@ -4425 +4426 @@
  * Loads certain guest MSRs into the VM-entry MSR-load and VM-exit MSR-store
  * areas. These MSRs will automatically be loaded to the host CPU on every
- * successful VM entry and stored from the host CPU on every successful VM exit.
+ * successful VM entry and stored from the host CPU on every successful VM-exit.
  *
  * This also creates/updates MSR slots for the host MSRs. The actual host
@@ -8627 +8628 @@
                                                 break; \
                                             } else do { } while (0)
-/* Duplicate of IEM_IS_CANONICAL(). */
-#define HMVMX_IS_CANONICAL(a_u64Addr)       ((uint64_t)(a_u64Addr) + UINT64_C(0x800000000000) < UINT64_C(0x1000000000000))
 
     int      rc;
@@ -8774 +8773 @@
             rc = VMXReadVmcs64(VMX_VMCS_HOST_SYSENTER_ESP, &u64Val);
             AssertRCBreak(rc);
-            HMVMX_CHECK_BREAK(HMVMX_IS_CANONICAL(u64Val), VMX_IGS_SYSENTER_ESP_NOT_CANONICAL);
+            HMVMX_CHECK_BREAK(X86_IS_CANONICAL(u64Val), VMX_IGS_SYSENTER_ESP_NOT_CANONICAL);
 
             rc = VMXReadVmcs64(VMX_VMCS_HOST_SYSENTER_EIP, &u64Val);
             AssertRCBreak(rc);
-            HMVMX_CHECK_BREAK(HMVMX_IS_CANONICAL(u64Val), VMX_IGS_SYSENTER_EIP_NOT_CANONICAL);
+            HMVMX_CHECK_BREAK(X86_IS_CANONICAL(u64Val), VMX_IGS_SYSENTER_EIP_NOT_CANONICAL);
         }
 #endif
@@ -8949 +8948 @@
             if (HMVMX_IS_64BIT_HOST_MODE())
             {
-                HMVMX_CHECK_BREAK(HMVMX_IS_CANONICAL(pCtx->fs.u64Base), VMX_IGS_FS_BASE_NOT_CANONICAL);
-                HMVMX_CHECK_BREAK(HMVMX_IS_CANONICAL(pCtx->gs.u64Base), VMX_IGS_GS_BASE_NOT_CANONICAL);
+                HMVMX_CHECK_BREAK(X86_IS_CANONICAL(pCtx->fs.u64Base), VMX_IGS_FS_BASE_NOT_CANONICAL);
+                HMVMX_CHECK_BREAK(X86_IS_CANONICAL(pCtx->gs.u64Base), VMX_IGS_GS_BASE_NOT_CANONICAL);
                 HMVMX_CHECK_BREAK(   (pCtx->ldtr.Attr.u & X86DESCATTR_UNUSABLE)
-                                  || HMVMX_IS_CANONICAL(pCtx->ldtr.u64Base), VMX_IGS_LDTR_BASE_NOT_CANONICAL);
+                                  || X86_IS_CANONICAL(pCtx->ldtr.u64Base), VMX_IGS_LDTR_BASE_NOT_CANONICAL);
                 HMVMX_CHECK_BREAK(!(pCtx->cs.u64Base >> 32), VMX_IGS_LONGMODE_CS_BASE_INVALID);
                 HMVMX_CHECK_BREAK((pCtx->ss.Attr.u & X86DESCATTR_UNUSABLE) || !(pCtx->ss.u64Base >> 32),
@@ -9008 +9007 @@
             if (HMVMX_IS_64BIT_HOST_MODE())
             {
-                HMVMX_CHECK_BREAK(HMVMX_IS_CANONICAL(pCtx->fs.u64Base), VMX_IGS_FS_BASE_NOT_CANONICAL);
-                HMVMX_CHECK_BREAK(HMVMX_IS_CANONICAL(pCtx->gs.u64Base), VMX_IGS_GS_BASE_NOT_CANONICAL);
+                HMVMX_CHECK_BREAK(X86_IS_CANONICAL(pCtx->fs.u64Base), VMX_IGS_FS_BASE_NOT_CANONICAL);
+                HMVMX_CHECK_BREAK(X86_IS_CANONICAL(pCtx->gs.u64Base), VMX_IGS_GS_BASE_NOT_CANONICAL);
                 HMVMX_CHECK_BREAK(   (pCtx->ldtr.Attr.u & X86DESCATTR_UNUSABLE)
-                                  || HMVMX_IS_CANONICAL(pCtx->ldtr.u64Base), VMX_IGS_LDTR_BASE_NOT_CANONICAL);
+                                  || X86_IS_CANONICAL(pCtx->ldtr.u64Base), VMX_IGS_LDTR_BASE_NOT_CANONICAL);
                 HMVMX_CHECK_BREAK(!(pCtx->cs.u64Base >> 32), VMX_IGS_LONGMODE_CS_BASE_INVALID);
                 HMVMX_CHECK_BREAK((pCtx->ss.Attr.u & X86DESCATTR_UNUSABLE) || !(pCtx->ss.u64Base >> 32),
@@ -9031 +9030 @@
         if (HMVMX_IS_64BIT_HOST_MODE())
         {
-            HMVMX_CHECK_BREAK(HMVMX_IS_CANONICAL(pCtx->tr.u64Base), VMX_IGS_TR_BASE_NOT_CANONICAL);
+            HMVMX_CHECK_BREAK(X86_IS_CANONICAL(pCtx->tr.u64Base), VMX_IGS_TR_BASE_NOT_CANONICAL);
         }
 #endif
@@ -9062 +9061 @@
             rc = VMXReadVmcs64(VMX_VMCS_GUEST_GDTR_BASE, &u64Val);
             AssertRCBreak(rc);
-            HMVMX_CHECK_BREAK(HMVMX_IS_CANONICAL(u64Val), VMX_IGS_GDTR_BASE_NOT_CANONICAL);
+            HMVMX_CHECK_BREAK(X86_IS_CANONICAL(u64Val), VMX_IGS_GDTR_BASE_NOT_CANONICAL);
 
             rc = VMXReadVmcs64(VMX_VMCS_GUEST_IDTR_BASE, &u64Val);
             AssertRCBreak(rc);
-            HMVMX_CHECK_BREAK(HMVMX_IS_CANONICAL(u64Val), VMX_IGS_IDTR_BASE_NOT_CANONICAL);
+            HMVMX_CHECK_BREAK(X86_IS_CANONICAL(u64Val), VMX_IGS_IDTR_BASE_NOT_CANONICAL);
         }
 #endif
@@ -9204 +9203 @@
 #undef HMVMX_ERROR_BREAK
 #undef HMVMX_CHECK_BREAK
-#undef HMVMX_IS_CANONICAL
 }