Changeset 74699 in vbox for trunk

Timestamp:

Oct 9, 2018 6:48:48 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 Added VMX non-root mode CR0 guest/host masking for SMSW (memory operand).

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h (modified) (1 diff)

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

@@ -5327 +5327 @@
     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 = iemVmxMaskCr0CR4(pVCpu, 0 /* iCrReg */, u64GuestCr0);
+#endif
+
     uint16_t u16Value;
     if (IEM_GET_TARGET_CPU(pVCpu) > IEMTARGETCPU_386)
-        u16Value = (uint16_t)pVCpu->cpum.GstCtx.cr0;
+        u16Value = (uint16_t)u64GuestCr0;
     else if (IEM_GET_TARGET_CPU(pVCpu) >= IEMTARGETCPU_386)
-        u16Value = (uint16_t)pVCpu->cpum.GstCtx.cr0 | 0xffe0;
+        u16Value = (uint16_t)u64GuestCr0 | 0xffe0;
     else
-        u16Value = (uint16_t)pVCpu->cpum.GstCtx.cr0 | 0xfff0;
+        u16Value = (uint16_t)u64GuestCr0 | 0xfff0;
 
     VBOXSTRICTRC rcStrict = iemMemStoreDataU16(pVCpu, iEffSeg, GCPtrEffDst, u16Value);