Changeset 45904 in vbox for trunk/include/VBox/vmm

Timestamp:

May 6, 2013 11:53:53 AM (12 years ago)

Author:

vboxsync

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

85530

Message:

VMM/HMVMXR0: Fixes for pure 32-bit darwin hosts (not hybrid) with better identification and separation of guest-natural, host-natural fields.

File:

• trunk/include/VBox/vmm/hm_vmx.h (modified) (3 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -1729 +1729 @@
 #ifdef VBOX_WITH_OLD_VTX_CODE
 # if HC_ARCH_BITS == 64
-# define VMXWriteVmcs VMXWriteVmcs64
+#  define VMXWriteVmcs VMXWriteVmcs64
 # else
-# define VMXWriteVmcs VMXWriteVmcs32
+#  define VMXWriteVmcs VMXWriteVmcs32
 # endif
 #else /* !VBOX_WITH_OLD_VTX_CODE */
-# if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
-# define VMXWriteVmcsHstN VMXWriteVmcs64
-# else
-# define VMXWriteVmcsHstN VMXWriteVmcs32
+# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
+#  define VMXWriteVmcsHstN(idxField, uVal)       HMVMX_IS_64BIT_HOST_MODE() ?                     \
+                                                   VMXWriteVmcs64(idxField, uVal)                 \
+                                                 : VMXWriteVmcs32(idxField, uVal)
+#  define VMXWriteVmcsGstN(idxField, u64Val)     (pVCpu->CTX_SUFF(pVM)->hm.s.fAllow64BitGuests) ? \
+                                                   VMXWriteVmcs64(idxField, u64Val)               \
+                                                 : VMXWriteVmcs32(idxField, u64Val)
+# elif HC_ARCH_BITS == 32
+#  define VMXWriteVmcsHstN                       VMXWriteVmcs32
+#  define VMXWriteVmcsGstN(idxField, u64Val)     VMXWriteVmcs64Ex(pVCpu, idxField, u64Val)
+# else  /* HC_ARCH_BITS == 64 */
+#  define VMXWriteVmcsHstN                       VMXWriteVmcs64
+#  define VMXWriteVmcsGstN                       VMXWriteVmcs64
 # endif
-# define VMXWriteVmcsGstN VMXWriteVmcs64
-#endif
+#endif  /* !VBOX_WITH_OLD_VTX_CODE */
 
 
@@ -1837 +1845 @@
 #endif
 
+#ifdef VBOX_WITH_OLD_VTX_CODE
 # if HC_ARCH_BITS == 64
 #  define VMXReadVmcsField VMXReadVmcs64
@@ -1842 +1851 @@
 #  define VMXReadVmcsField VMXReadVmcs32
 # endif
+#endif
 
 /**