Changeset 47076 in vbox for trunk/src/VBox

Timestamp:

Jul 10, 2013 1:22:48 PM (12 years ago)

Author:

vboxsync

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

87126

Message:

VMM/HM(VMX|SVM)R0: Easier to toggle statements.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (2 diffs)
• HMVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -623 +623 @@
 #ifdef HMSVM_ALWAYS_TRAP_ALL_XCPTS
         /* If you add any exceptions here, make sure to update hmR0SvmHandleExit(). */
-        pVmcb->ctrl.u32InterceptException |=   RT_BIT(X86_XCPT_BP)
+        pVmcb->ctrl.u32InterceptException |= 0
+                                             | RT_BIT(X86_XCPT_BP)
                                              | RT_BIT(X86_XCPT_DB)
                                              | RT_BIT(X86_XCPT_DE)
@@ -632 +633 @@
                                              | RT_BIT(X86_XCPT_GP)
                                              | RT_BIT(X86_XCPT_PF)
-                                             | RT_BIT(X86_XCPT_MF);
+                                             | RT_BIT(X86_XCPT_MF)
+                                             ;
 #endif
 

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -2988 +2988 @@
         /* Additional intercepts for debugging, define these yourself explicitly. */
 #ifdef HMVMX_ALWAYS_TRAP_ALL_XCPTS
-        pVCpu->hm.s.vmx.u32XcptBitmap |=   RT_BIT(X86_XCPT_BP)
+        pVCpu->hm.s.vmx.u32XcptBitmap |= 0
+                                         | RT_BIT(X86_XCPT_BP)
                                          | RT_BIT(X86_XCPT_DB)
                                          | RT_BIT(X86_XCPT_DE)
@@ -2997 +2998 @@
                                          | RT_BIT(X86_XCPT_GP)
                                          | RT_BIT(X86_XCPT_PF)
-                                         | RT_BIT(X86_XCPT_MF);
+                                         | RT_BIT(X86_XCPT_MF)
+                                         ;
 #elif defined(HMVMX_ALWAYS_TRAP_PF)
         pVCpu->hm.s.vmx.u32XcptBitmap    |= RT_BIT(X86_XCPT_PF);