Changeset 70949 in vbox for trunk

Timestamp:

Feb 10, 2018 3:41:14 PM (7 years ago)

Author:

vboxsync

Message:

VMM: Added a bMainExecutionEngine member to the VM structure for use instead of fHMEnabled and fNEMEnabled. Changed a lot of HMIsEnabled invocations to use the new macros VM_IS_RAW_MODE_ENABLED and VM_IS_HM_OR_NEM_ENABLED. Eliminated fHMEnabledFixed. Fixed inverted test for raw-mode debug register sanity checking. Some other minor cleanups. [build fix]

File:

• trunk/src/VBox/VMM/VMMR3/VMMSwitcher.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/VMMSwitcher.cpp

@@ -45 +45 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-#if defined(VBOX_WITH_RAW_MODE) || (HC_ARCH_BITS != 64)
+#if defined(VBOX_WITH_RAW_MODE) || HC_ARCH_BITS != 64
+
 /** Array of switcher definitions.
  * The type and index shall match!
@@ -93 +94 @@
 # endif
 };
-#endif /* VBOX_WITH_RAW_MODE || (HC_ARCH_BITS != 64) */
-
 
 /** Array of switcher definitions.
@@ -102 +101 @@
 {
     NULL, /* invalid entry */
-#if HC_ARCH_BITS == 32
+# if HC_ARCH_BITS == 32
     NULL,   //&vmmR3Switcher32BitTo32Bit_Def,
     NULL,   //&vmmR3Switcher32BitToPAE_Def,
@@ -112 +111 @@
     NULL,   //&vmmR3SwitcherAMD64ToPAE_Def,
     NULL,   //&vmmR3SwitcherAMD64ToAMD64_Def,
-#else  /* !VBOX_WITH_RAW_MODE */
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-#endif /* !VBOX_WITH_RAW_MODE */
-#ifndef RT_ARCH_AMD64
+# else  /* !VBOX_WITH_RAW_MODE */
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+# endif /* !VBOX_WITH_RAW_MODE */
+# ifndef RT_ARCH_AMD64
     &vmmR3SwitcherX86Stub_Def,
     NULL,
-#else
+# else
     NULL,
     &vmmR3SwitcherAMD64Stub_Def,
-#endif
+# endif
 };
+
+#endif /* VBOX_WITH_RAW_MODE || HC_ARCH_BITS != 64 */