Changeset 78681 in vbox for trunk

Timestamp:

May 23, 2019 7:39:24 AM (6 years ago)

Author:

vboxsync

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

130757

Message:

VMM/IEM: Nested VMX: bugref:9180 Renamed iemVmxMaskCr0CR4 to iemVmxGetMaskedCr0Cr4, there's no modification to CR0/CR4 being done here. Fixed a missing comma typo.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllCImpl.cpp.h (modified) (3 diffs)
• IEMAllCImplVmxInstr.cpp.h (modified) (2 diffs)

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

@@ -5445 +5445 @@
             {
                 /* CR0/CR4 reads are subject to masking when in VMX non-root mode. */
-                crX = iemVmxMaskCr0CR4(pVCpu, iCrReg, crX);
+                crX = iemVmxGetMaskedCr0Cr4(pVCpu, iCrReg, crX);
                 break;
             }
@@ -5484 +5484 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
     if (IEM_VMX_IS_NON_ROOT_MODE(pVCpu))
-        u64GuestCr0 = iemVmxMaskCr0CR4(pVCpu, 0 /* iCrReg */, u64GuestCr0);
+        u64GuestCr0 = iemVmxGetMaskedCr0Cr4(pVCpu, 0 /* iCrReg */, u64GuestCr0);
 #endif
 
@@ -5528 +5528 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
     if (IEM_VMX_IS_NON_ROOT_MODE(pVCpu))
-        u64GuestCr0 = iemVmxMaskCr0CR4(pVCpu, 0 /* iCrReg */, u64GuestCr0);
+        u64GuestCr0 = iemVmxGetMaskedCr0Cr4(pVCpu, 0 /* iCrReg */, u64GuestCr0);
 #endif
 

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

@@ -288 +288 @@
         /*     9 */ RT_UOFFSETOF(VMXVVMCS, u64GuestBndcfgsMsr),
         /*    10 */ RT_UOFFSETOF(VMXVVMCS, u64GuestRtitCtlMsr),
-        /* 11-18 */ UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX
+        /* 11-18 */ UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX,
         /* 19-25 */ UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX
     },
@@ -1401 +1401 @@
 
 /**
- * Masks the nested-guest CR0/CR4 mask subjected to the corresponding guest/host
- * mask and the read-shadow (CR0/CR4 read).
- *
- * @returns The masked CR0/CR4.
+ * Gets the masked nested-guest CR0/CR4 subject to the corresponding guest/host mask
+ * and the CR0/CR4 read-shadow.
+ *
+ * @returns The masked nested-guest CR0/CR4.
  * @param   pVCpu       The cross context virtual CPU structure.
  * @param   iCrReg      The control register (either CR0 or CR4).
  * @param   uGuestCrX   The current guest CR0 or guest CR4.
  */
-IEM_STATIC uint64_t iemVmxMaskCr0CR4(PVMCPU pVCpu, uint8_t iCrReg, uint64_t uGuestCrX)
+IEM_STATIC uint64_t iemVmxGetMaskedCr0Cr4(PVMCPU pVCpu, uint8_t iCrReg, uint64_t uGuestCrX)
 {
     Assert(IEM_VMX_IS_NON_ROOT_MODE(pVCpu));