Changeset 78689 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

Timestamp:

May 23, 2019 10:44:35 AM (6 years ago)

Author:

vboxsync

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

130765

Message:

VMM/IEM: Nested VMX: bugref:9180 Use CPUMGetGuestVmxMasked[Cr0|Cr4], remove iemVmxGetMaskedCr0Cr4.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -5441 +5441 @@
         switch (iCrReg)
         {
-            case 0:
-            case 4:
-            {
-                /* CR0/CR4 reads are subject to masking when in VMX non-root mode. */
-                crX = iemVmxGetMaskedCr0Cr4(pVCpu, iCrReg, crX);
-                break;
-            }
+            /* CR0/CR4 reads are subject to masking when in VMX non-root mode. */
+            case 0: crX = CPUMGetGuestVmxMaskedCr0(pVCpu, &pVCpu->cpum.GstCtx); break;
+            case 4: crX = CPUMGetGuestVmxMaskedCr4(pVCpu, &pVCpu->cpum.GstCtx); break;
 
             case 3:
@@ -5481 +5477 @@
     IEM_SVM_CHECK_READ_CR0_INTERCEPT(pVCpu, 0 /* uExitInfo1 */, 0 /* uExitInfo2 */);
 
-    uint64_t u64GuestCr0 = pVCpu->cpum.GstCtx.cr0;
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-    if (IEM_VMX_IS_NON_ROOT_MODE(pVCpu))
-        u64GuestCr0 = iemVmxGetMaskedCr0Cr4(pVCpu, 0 /* iCrReg */, u64GuestCr0);
+    uint64_t const u64GuestCr0 = !IEM_VMX_IS_NON_ROOT_MODE(pVCpu)
+                               ? pVCpu->cpum.GstCtx.cr0
+                               : CPUMGetGuestVmxMaskedCr0(pVCpu, &pVCpu->cpum.GstCtx);
+#else
+    uint64_t const u64GuestCr0 = pVCpu->cpum.GstCtx.cr0;
 #endif
 
@@ -5525 +5523 @@
     IEM_SVM_CHECK_READ_CR0_INTERCEPT(pVCpu, 0 /* uExitInfo1 */, 0 /* uExitInfo2 */);
 
-    uint64_t u64GuestCr0 = pVCpu->cpum.GstCtx.cr0;
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-    if (IEM_VMX_IS_NON_ROOT_MODE(pVCpu))
-        u64GuestCr0 = iemVmxGetMaskedCr0Cr4(pVCpu, 0 /* iCrReg */, u64GuestCr0);
+    uint64_t const u64GuestCr0 = !IEM_VMX_IS_NON_ROOT_MODE(pVCpu)
+                               ? pVCpu->cpum.GstCtx.cr0
+                               : CPUMGetGuestVmxMaskedCr0(pVCpu, &pVCpu->cpum.GstCtx);
+#else
+    uint64_t const u64GuestCr0 = pVCpu->cpum.GstCtx.cr0;
 #endif